summaryrefslogtreecommitdiffstats
path: root/core/definitions.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-47/+67
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/build into cm-13.0 Android 6.0.1 release 3 Change-Id: Ifd951be596daad53785b191ddce316a6a4a96e03
| * Add all-named-(dirs|files)-under and relatedDan Willemsen2015-10-131-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To consolidate the number of places that we're using 'find' in the tree, add some more helpers: all-named-dirs-under all-subdir-named-dirs all-named-files-under all-subdir-named-files This change also makes many of the current helpers use these helpers instead of using their own implementation. The 'dirs' helpers are using '-type d' so that they only output directories. It's probably safe to use '-type f' for the files helpers, but that increased the kati load time by ~20%. Bug: 24204119 Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
| * Add all-cpp-files-underDan Willemsen2015-10-131-0/+23
| | | | | | | | | | | | | | | | There are multiple versions of this in the tree. Let's standardize on one that will work for everyone, and will sort the results. Bug: 24204119 Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
| * Sort all files found via $(shell find)Dan Willemsen2015-10-131-23/+23
| | | | | | | | | | | | | | Don't rely on filesystem ordering to make these the same for all builds. Bug: 24204119 Change-Id: I7313062157764091acecf45f4b57405c28858546
| * Don't add build number to apps' version name for platform build.Ying Wang2015-09-211-6/+10
| | | | | | | | | | Bug: 24201956 Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
* | build/core: Define find-other-aidl-files.Adnan Begovic2015-10-271-0/+4
| | | | | | | | | | | | | | Useful when utilizing relative paths that mention external projects. Mimics find-other-java-files, etc. Change-Id: I3df67f4f35a931facbb1de76936936b092a42bb2
* | Add all-cpp-files-underDan Willemsen2015-10-161-0/+23
| | | | | | | | | | | | | | | | There are multiple versions of this in the tree. Let's standardize on one that will work for everyone, and will sort the results. Bug: 24204119 Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
* | build: Fix some colored build issuesOliver Middleton2015-10-061-3/+3
| | | | | | | | | | | | | | * Fix some broken lines in definitions.mk * Finish adding colors to product-graph.mk Change-Id: I235a60c967b1f10ec6dd1cac25740badbd3b64c9
* | colorize non-fatal javac stderr yellow (and actually display it... at all)nuclearmistake2015-10-061-3/+5
| | | | | | | | | | | | | | woops! Signed-off-by: nuclearmistake <nuclearmistake@gmail.com> Change-Id: I984f428022a68a825aa041866e8d459bd6611f71
* | Colorize javac errorsnuclearmistake2015-10-061-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You know those multi-line ones that are frequently interspersed with other buld output? The ones that don't even have the word "error" in them to search for? This makes them red. ps2: fix jar_check failures cause by leaving empty stderr files in intermediates dirs this is probably not the best place to store stderr before colorizing it if javac exits non-zero, but it seems much lighter than mkdiring a bunch of temp directories or using sed to mangle the paths to point to per-intermediates directory unique temporary file names Change-Id: I3b9b7d8a0c76958588ac1603b6742987d6dde54c Signed-off-by: nuclearmistake <nuclearmistake@gmail.com>
* | Use less heap space for dex on 32-bit build hostsSebastian Schmidt2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | Run dex with -JXmx1024M instead of 2048M if running on a 32-bit host. Surprisingly this appears to also work for framework and services; if not, a little fine-tuning will be needed. This does not change anything for non-32-bit hosts. Change-Id: I1d87c3e394acc934af6f7770ea54ba265a1df838
* | build-with-colors: moar colorsChirayu Desai2015-10-061-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rename CL_PFX and CL_INS to better match the colors they show. - add more colors. Output of: - most host stuff is yellow - most target stuff is green - installing/copying files is cyan - import/export includes and notice files is cyan - bootimage/recoveryimage is cyan - and some more colors in many places ;) Change-Id: I5532afa4ba608e0a7c408516dc9f912f9ca389f7
* | build in colors: Install outputs in blue/yellow [basic ics version]Tanguy Pruvot2015-10-061-8/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | | "target prefix:" in yellow "Install: file" in cyan should be in a single command line else there are sync problems in multithread (-j X) These colors can be tuned in core/Makefile if you use a white terminal. can be disabled with "export BUILD_WITH_COLORS=0" Only the most important output is colored to reduce ics merge problems Change-Id: I0e585079fde6900799ef209367a523d94a51cda5 Colors: add more colors to final build steps also fix releasetool echo and visible recovery echos Change-Id: Icf5d88468572f935610c544bf1d5d356ec9870d3 build in colors: host C/C++ Change-Id: Ic415cab53a2efa104c9d4b31ddbe8c8eb74e493d
* Don't uncompress/page-align the jni libraries in apps_only build.Ying Wang2015-07-151-2/+13
| | | | | | | | | | | | | Don't uncompress/page-align the jni libraries in apps_only build, because the apk may be run on older platforms that don't support loading jni directly from apk. When prebuilt apks are installed to platform build, the build system will automatically uncompress/page-align the prebuit apks in M and downstream, so no need to uncompress/page-align in the apps_only build either. Bug: 22491084 Change-Id: I67e977b2592800ae467450592069843b4e5fc466
* am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; ↵C. Sean Young2015-06-121-1/+1
|\ | | | | | | | | | | | | specifies directories to exclude when searching source tree. * commit 'cbaead4cfe737c96c649672b6c1396c35597b5b7': Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
| * am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies ↵C. Sean Young2015-06-121-1/+1
| |\ | | | | | | | | | | | | | | | | | | directories to exclude when searching source tree. * commit '540772fa2287e63a0c745229fb72b78903c9cd70': Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
| | * Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when ↵C. Sean Young2015-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | searching source tree. These directories are excluded in addition to OUT_DIR. This can be useful if your build system has other output directories beyond what OUT_DIR is set to. Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
* | | Switch build to stricter aapt symbol generationAdrian Roos2015-06-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Prevents aapt from generating java symbols for strings that don't have a default localization. Bug: 21537397 Change-Id: I2f17397e33d823045f7dcff02e3d0817f3f81849
* | | Merge changes from topic 'prebuilt-open-from-apk' into mnc-devDimitry Ivanov2015-06-041-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Uncompress .so files before signing the apk. Don't extract jni from prebuilt apks.
| * | | Don't extract jni from prebuilt apks.Ying Wang2015-06-011-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We don't need LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES now, for we always page-align jni shared libraries and store them umcompressed. - For prebuilt apks, we don't extract jni any more; Instead we always run uncompress-shared-libs on them. - For apks built from source, we still install the jni separately, because that way multiple apks can share the same jni and it saves space. With this change, for most prebuilt apks, we don't need to specify LOCAL_PREBUILT_JNI_LIBS ("@lib/<abi>/foo.so") any more, for the build system automatically replaces the embedded jni with uncompressed files; But if a prebuilt is a fat apk (i.e. containing jni not needed by the current product architecture), you still need LOCAL_PREBUILT_JNI_LIBS to specify what jni to keep. Otherwise all embedded jni will be replaced with uncompressed files, that wastes space. Bug: 8076853 Change-Id: Ic3666dc72bf17cd293787414dd185470b365f967
* | | | Merge "Add support for RMTYPEDEF with Jack" into mnc-devYohann Roussel2015-06-021-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for RMTYPEDEF with JackYohann Roussel2015-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | Bug: 21099584 Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
* | | | Add $ORIGIN/lib[64] to host binary's rpath.Ying Wang2015-06-011-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries in the bin subdirectory; For historical reason the binaries in the SDK package don't have a bin subdirectory. This workaround enables them to work in the exsiting SDK directory structure. Bug: 21301578 Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
* | | Cleaned the outdated incrementaljavac.Ying Wang2015-05-081-70/+0
| | | | | | | | | | | | | | | | | | Nobody is using this feature and now we switched to jack. Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
* | | Revert "Fix and cleanup."Ying Wang2015-05-081-11/+70
| | | | | | | | | | | | | | | | | | This reverts commit f28bad5227dd566395e458b5266e716d7fa5f958. Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
* | | Fix and cleanup.Ying Wang2015-05-071-70/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Detect java-source-list before transforming to java-source-list-uniq. This fixes non-fatal errors in build log like: /bin/bash: out/target/common/obj/APPS/android.core.tests.libcore.package.tzdata_intermediates/classes/java-source-list: No such file or directory - Cleaned the outdated incrementaljavac. Nobody is using this feature and now we switched to jack. Change-Id: If1adb9b5820d9b295a11984c0f170f9a7ff4de7b
* | | Revert "Don't extract jni from prebuilt apks."Ying Wang2015-05-041-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67. Bug: 20810492 Bug: 20811499 Change-Id: Ic922d9daccc4550db489c0f3d4ad6b4ff85b5e60
* | | Don't extract jni from prebuilt apks.Ying Wang2015-05-011-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We don't need LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES now, for we always page-align jni shared libraries and store them umcompressed. - For prebuilt apks, we don't extract jni any more; Instead we always run uncompress-shared-libs on them. - For apks built from source, we still install the jni separately, because that way multiple apks can share the same jni and it saves space. With this change, for most prebuilt apks, we don't need to specify LOCAL_PREBUILT_JNI_LIBS ("@lib/<abi>/foo.so") any more, for the build system automatically replaces the embedded jni with uncompressed files; But if a prebuilt is a fat apk (i.e. containing jni not needed by the current product architecture), you still need LOCAL_PREBUILT_JNI_LIBS to specify what jni to keep. Otherwise all embedded jni will be replaced with uncompressed files, that wastes space. Bug: 8076853 Change-Id: Icf07e0998ac3602e6e05e80fed836fbafca33e01
* | | am 6f2935dc: am dabf96ab: am c84b3a78: am 648f1b66: Merge "Pack relocation ↵Dmitriy Ivanov2015-04-231-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | tables for dynamic executables" * commit '6f2935dc1432a38e149498b6efbd43ed9aceb827': Pack relocation tables for dynamic executables
| * | Pack relocation tables for dynamic executablesDmitriy Ivanov2015-04-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add replocation-packer step for dynmic executables. Enable it by default for arm and arm64 platforms. Bug: http://b/18051137 Change-Id: I0c88fd31595bcea62a087f219acb9ecf9c80f2e5
* | | am 893ed24d: am 387a9fee: am 941d61de: am 1ff47c7f: Merge "Revert "Pack ↵Dimitry Ivanov2015-04-231-9/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | relocation tables for all dynamic executables"" * commit '893ed24dd7cec9b560fe46862b3635efa327ec65': Revert "Pack relocation tables for all dynamic executables"
| * | Revert "Pack relocation tables for all dynamic executables"Dimitry Ivanov2015-04-231-9/+0
| | | | | | | | | | | | | | | | | | This reverts commit e7a1b8a0c6d5f56e415345a0aceef3afe5ff5eff. Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
* | | am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation ↵Dmitriy Ivanov2015-04-231-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | tables for all dynamic executables" * commit 'ff084258ea53c414d724ba87f89c324056def1bd': Pack relocation tables for all dynamic executables
| * | Pack relocation tables for all dynamic executablesDmitriy Ivanov2015-04-221-0/+9
| | | | | | | | | | | | | | | Bug: http://b/18051137 Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
* | | am ebe3f7a5: am 700265ce: am 69b20474: Merge "Support ↵Nick Kralevich2015-04-181-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs" * commit 'ebe3f7a59878d797f8f0de234f251958fee1c5af': Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs
| * | Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKsNick Kralevich2015-04-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a prebuilt APK contains shared libraries and the flag LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES := true is set, then uncompress any shared libraries stored within the APK. This allows processes to load the shared library directly from the APK. Bug: 20247329 Bug: 8076853 Bug: 1162500 Change-Id: Iac4db32457d9ce31eb7256410023819b44fda0a6
* | | am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove ↵Dmitriy Ivanov2015-04-171-2/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" * commit 'a6c44859c5344d489526641ce5a08598254da57b': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
| * | Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONSDmitriy Ivanov2015-04-171-2/+3
| | | | | | | | | | | | | | | | | | Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead. Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
| * | Remove ancient ranlib workaround on Mac OS X.Ying Wang2015-04-091-26/+0
| | | | | | | | | | | | | | | | | | Apparently we don't need it for Mac OS X 10.7 and above. Change-Id: I5ee81700c16e8c66b2d5f2b373fd2d523b5ec018
* | | Remove ancient ranlib workaround on Mac OS X.Ying Wang2015-04-091-26/+0
| | | | | | | | | | | | | | | | | | Apparently we don't need it for Mac OS X 10.7 and above. Change-Id: I5ee81700c16e8c66b2d5f2b373fd2d523b5ec018
* | | resolved conflicts for merge of 133415d5 to masterYing Wang2015-04-081-0/+11
|\ \ \ | |/ / | | | | | | Change-Id: Iba6c1dd40e7a4c8058e7100f03296c8f72a2c949
| * | Better way to package up the otatools-package.Ying Wang2015-04-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | With this, you can easily add more executables, jars or shared libraries to the package. Also now it automatically takes care of 32-bit-v.s.-64-bit library issue. Change-Id: I5afe00fadc978d0da229b192eca1a4b1c149764e
* | | Consolidate the nanopb-c and regular protobuf build rules.Ying Wang2015-04-071-16/+2
| | | | | | | | | | | | | | | Bug: 20093047 Change-Id: I38ebd748aacce6d215403da481ad04833810a995
* | | am ea517854: am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."Ying Wang2015-04-041-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'ea5178545bf939fb65f77cd54eba9f274512638b': Convert bc depfiles to .P files.
| * | Convert bc depfiles to .P files.Ying Wang2015-04-031-0/+4
| | | | | | | | | | | | | | | | | | So you don't need clean step when a header file gets moved or deleted. Change-Id: Iec0d63b89ba17c4ef0ad75f4a52b6759f2bff58a
* | | am 5c11bd52: am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"Ying Wang2015-04-031-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '5c11bd52db5d0887196895f321bf723ca1d206c7': Use PRIVATE_ALL_OBJECTS
| * | Use PRIVATE_ALL_OBJECTSYing Wang2015-04-021-2/+2
| | | | | | | | | | | | | | | | | | Instead of the dirty $(filter) call. Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
* | | am 8f7338d9: am dc8d7092: am 0064c51e: Merge "Use prebuilt libclang_rt.profile."Dan Albert2015-04-021-1/+6
|\ \ \ | |/ / | | | | | | | | | * commit '8f7338d9b145379ea9c51b7e551509a2d8f0f24e': Use prebuilt libclang_rt.profile.
| * | Use prebuilt libclang_rt.profile.Dan Albert2015-04-011-1/+6
| | | | | | | | | | | | | | | Bug: 17574078 Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
* | | Merge "Merge commit '597cfdb' into merge"Etan Cohen2015-04-021-0/+13
|\ \ \
generated by cgit v1.1 at 2024-05-27 13:45:14 +0000