summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-devColin Cross2014-08-051-2/+0
|\ \ | |/ |/|
| * Revert "HACK: report CPU abi as 2nd arch if present"Colin Cross2014-08-051-2/+0
| | | | | | | | | | | | | | | | This reverts commits 8179d4dcf658f195aa21040b88cc0e70e66cdcd5, 00c67a056837b5ebda1bda950265a1fa086b4e53, and d00c0a2e20c5df26066d44175a8da29ccf4e76a6. Bug: 15933961
* | [MIPSR6] Add mips64r6 and mips32r6 targetsDuane Sand2014-08-054-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | Add mips64r6 target and corresponding mips32r6 target. Defaults remain as mips64r2 and mips32r2. Apply -FP64A codegen subsetting to mips32r6 only. Access FR=0 odd-numbered 32-bit float regs only via double-prec even-numbered regs, not by single-prec ops. (cherry picked from commit 6bab974cdc90cb3a7514c7255b6e6adfb9c98e2b) Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
* | [MIPS64] Enable mips64 clangDuane Sand2014-08-052-4/+1
| | | | | | | | | | | | (cherry picked from commit 41ca4446370ba90e472e45a8897868855185a6c7) Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
* | [MIPS] Unite mipsel and mips64el 4.9 gcc toolchainsDuane Sand2014-08-0515-145/+27
|/ | | | | | | | | | | | | | Use 4.9 mips64el toolchain for both 64- and 32-bit builds. Tell ld when 32-bit links are required. Override 4.9's changed defaults for mips floating point register use, to get same assembler rules as 4.8 and earlier. Also: drop unused soft-fp build targets, cleanout redundant compiler options, and remove extraneous Android.mk file. (cherry picked from commit 6670e24aed1ca66f21a6af759a0d156bb3df1739) Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
* Merge "store images in target-files" into lmp-devDoug Zongker2014-07-311-0/+1
|\
| * store images in target-filesDoug Zongker2014-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store sparse images in the target-files, and use those (when they're available) for building block OTAs. - New script add_img_to_target_files is added to make the images and add them to the IMAGES/ subdir in the target-files. It gets run from the Makefile when building a target-files. - img_from_target_files becomes mostly vestigial: it creates the img.zip by just copying the images out of the target-files. (It still knows how to build images for use on older target-files.) - ota_from_target_files uses images from the target-files in preference to rebuilding images from the source files. - sign_apk_target_files builds images and includes them in its output target files (even if the input target-files didn't have them). Bug: 16488065 Change-Id: I444e0d722d636978209467ffc01750a585c6db75
* | Merge "Update the FDO support:" into lmp-devDehao Chen2014-07-299-39/+4
|\ \ | |/ |/|
| * Update the FDO support:Dehao Chen2014-07-309-39/+4
| | | | | | | | | | | | | | | | * Explicitly check BUILD_FDO_INSTRUMENT and BUILD_FDO_OPTIMIZE with true * Remove unnecessary target_libgcov * Update the profile collection path on device so that most app can have write access Change-Id: I5c1915a12ea37b2cb3c76a27e7104e47ad636928
* | Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" ↵Ying Wang2014-07-301-0/+4
|\ \ | | | | | | | | | into lmp-dev
| * | Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is setYing Wang2014-07-301-0/+4
| |/ | | | | | | | | Bug: 16319961 Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
* | Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""Ying Wang2014-07-302-0/+15
|/ | | | | | | | | This reverts commit a4f84fdfed9a805d69b37de997512cd0616b3ff8. Added "export CCACHE_CPP2 := true" to work around ccache bug with clang. See: http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
* Merge "Fix doc target for multidex support library." into lmp-devYohann Roussel2014-07-241-4/+5
|\
| * Fix doc target for multidex support library.Yohann Roussel2014-07-251-4/+5
| | | | | | | | | | | | (cherry picked from commit 5679e356d298c58e839f03c45050192e813e79f8) Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1
* | Merge "Default to "prescott" as our baseline i686 host build architecture." ↵Stephen Hines2014-07-241-1/+1
|\ \ | | | | | | | | | into lmp-dev
| * | Default to "prescott" as our baseline i686 host build architecture.Stephen Hines2014-07-251-1/+1
| |/ | | | | | | | | | | Bug: 16408818 Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
* | Switch NDK arm64 libraries to 4.9.Przemyslaw Szczepaniak2014-07-251-1/+1
|/ | | | | Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4 (cherry picked from commit 5895dd13a7c96a3100048dae8fc1195abc8c9beb)
* Support to set up TARGET_COPY_OUT_VENDOR in board config.Ying Wang2014-07-231-3/+23
| | | | | | | | | | | | | We first define TARGET_COPY_OUT_VENDOR as a placeholder. In product config makefiiles we actually get the placeholders in PRODUCT_COPY_FILES. A device can set up TARGET_COPY_OUT_VENDOR in its BoardConfig.mk. We substitute the placeholder with the real TARGET_COPY_OUT_VENDOR value after loading the BoardConfig.mk. With this change, we can support building vendor stuff to system.img (the default) or a separate vendor.img. Bug: 16515152 Change-Id: I5b601d7a8b34fe032a1bac02aa5c204a3765691d
* Merge "Refactor FDO support code to ensure arm64 can also be built with ↵Dehao Chen2014-07-238-146/+47
|\ | | | | | | FDO." into lmp-dev
| * Refactor FDO support code to ensure arm64 can also be built with FDO.Dehao Chen2014-07-238-146/+47
| | | | | | | | Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
* | Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" ↵Ying Wang2014-07-231-0/+36
|\ \ | | | | | | | | | into lmp-dev
| * | Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITSYing Wang2014-07-231-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In prebuilt app module, you can use LOCAL_PACKAGE_SPLITS to specify a list of prebuilt split apks. The build system will sign and zipalign the apks and install them with the same file names. Note that you need to put all the source split apks in the same folder. Bug: 16319961 Change-Id: Id2b6d743c1edc5e436007ec11acece1748adad45
* | | Merge "Improve rules of split apks." into lmp-devYing Wang2014-07-232-18/+16
|\ \ \ | |_|/ |/| |
| * | Improve rules of split apks.Ying Wang2014-07-232-18/+16
| |/ | | | | | | | | | | | | | | | | | | | | - Better messaging if the expected split apk isn't generated by the aapt command in the base apk rule; Remove the built base apk, so make will rerun aapt after the user changes the splitting parameters. - Use cleaner static pattern rules instead of running $(foreach) with $(eval). Bug: 16319961 Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
* | Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidexYohann Roussel2014-07-231-2/+2
|/ | | | | | | | | This keeps only the real sources in doc target and fixes some error messages caused by trying to generate docs of the tests. (cherry picked from commit 100aba5374376f679602387db59fccd609b8abe3) Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
* Delete .swp file added by accident.Ying Wang2014-07-221-0/+0
| | | | | | Also added .swp to .gitignore. Change-Id: I51700f55230facde2e46574aa039d45ae5b29cdf
* Support LOCAL_PACKAGE_SPLITS.Ying Wang2014-07-225-1/+43
| | | | | | | | | Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables and generates multiple apks. The build system sets up rules to sign and zipalign the split apks. Bug: 16319961 Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
* Merge "Create a vendor build.prop for verifying versions" into lmp-devDaniel Rosenberg2014-07-221-0/+16
|\
| * Create a vendor build.prop for verifying versionsDaniel Rosenberg2014-07-221-0/+16
| | | | | | | | | | | | | | | | | | The vendor build.prop contains the fingerprint for the build, and timestamps. It allows you to tell if the vendor partition matches the system partition. Change-Id: Icf261571e82823928b2562e66e48fbcb0da55801 Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-devSebastien Hertz2014-07-171-1/+1
|\ \
| * | Vary non-image Xmx for dex2oat on MIPS.Ian Rogers2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The image Xmx is already fixed at 64m. The issue is in the non boot image case. (cherry picked from commit 87f0d006f254dc49621a8cd925b5448344eb367f) Change-Id: Id4a6d9e8edf00505198c3f3dd599cb7b7f06363a
* | | Merge "Include cts-junit target for cts tests." into lmp-devTsu Chiang Chuang2014-07-221-0/+1
|\ \ \ | |/ / |/| |
| * | Include cts-junit target for cts tests.Tsu Chiang Chuang2014-07-211-0/+1
| | | | | | | | | | | | | | | | | | (cherry picked from commit 1949a41e70c70fd71fb8decf9fb2f98aab3b7198) Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
* | | Merge "Fix the MIPS build." into lmp-devSebastien Hertz2014-07-171-5/+11
|\ \ \
| * | | Fix the MIPS build.Ian Rogers2014-07-221-5/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Use an override for the dex2oat Xmx value when cross-compiling. Bug: 16221224 (cherry picked from commit 7d70f830bce969575b358a39e041e85013881cd4) Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
* | | Remove unnecessary dependency of the sdk target.Ying Wang2014-07-211-1/+0
|/ / | | | | | | | | | | | | ALL_GENERATED_SOURCES forces to build heavy things already covered by build cache. Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
* | Merge "Remove framework2" into lmp-devYing Wang2014-07-193-3/+2
|\ \
| * | Remove framework2Ying Wang2014-07-213-3/+2
| |/ | | | | | | | | | | We don't need fraemwork2 split with the multidex framework.jar. Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
* | The order of SDK version matters.Ying Wang2014-07-211-2/+4
|/ | | | | | | Because some places assumes the last item is the latest public SDK version number. Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
* Support "LOCAL_SDK_VERSION := system_current"Ying Wang2014-07-196-10/+18
| | | | | | | | A module can declare "LOCAL_SDK_VERSION := system_current" to build against the android system stubs generated from source. For now this is only supported in platform build. Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
* Trim down BUILD_FINGERPRINT.Ying Wang2014-07-191-1/+8
| | | | | | | | Bug: 15593959 Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f Conflicts: core/build_id.mk
* Update rule of APPS_ZIP to use the new paths of apks.Ying Wang2014-07-181-1/+1
| | | | | Bug: 16319961 Change-Id: I9fc93f329a34e404beaf3fa212772b731a7020ff
* New installation path for apks and their JNIs.Ying Wang2014-07-186-5/+23
| | | | | | | | | Apk's path is changed to <parent_dir>/MyApp/MyApp.apk; JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so. Symlinks of JNIs are changed accordingly. Bug: 16319961 Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
* Delete vendor and oem staging directory in "make installclean".Ying Wang2014-07-181-0/+2
| | | | Change-Id: If3211772ea37d4c249c2dc5cc69bd9f48a39b6e3
* Fail build if non-symlink /system/vendor detected while we are buildingYing Wang2014-07-171-0/+5
| | | | | | | | Fail build if non-symlink /system/vendor detected while we are building a separate vendor.img. Bug: 16360411 Change-Id: I96cb6d0b654d6632cd820ba193423e9a16214638
* Include vendor.img in PDK build.Ying Wang2014-07-161-1/+10
| | | | | | | | | - Add the stuff in /vendor to platform.zip. - Pull things of vendor.img from platform.zip when doing PDK fusion build. Bug: 16354024 Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
* Add tvdpi to list of possible recovery asset densitiesJoe LaPenna2014-07-151-1/+1
| | | | | | Bug: 16306251 Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
* reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. ↵Ed Heyl2014-07-142-2/+2
| | | | | | Please do not merge. Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
* DO NOT MERGE: Change build id to LMPGuang Zhu2014-07-151-1/+1
| | | | Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
* Added support for building verified vendor partitionDaniel Rosenberg2014-07-142-5/+5
| | | | | Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb Signed-off-by: Daniel Rosenberg <drosen@google.com>