summaryrefslogtreecommitdiffstats
path: root/core/clear_vars.mk
Commit message (Collapse)AuthorAgeFilesLines
* Add LOCAL_AIDL_FLAGSLuis Vidal2016-07-151-0/+1
| | | | | | Allow modules to define custom AIDL flags Change-Id: I5609e6eb0a10d441cea2556179c8496293116dcf
* binary: Allow specifying a path for generated proto headersRicardo Cerqueira2016-01-261-0/+2
| | | | | | | | | | | | | | | | | protobuf compilation defaults to dropping the generated objects and headers onto a path derived from the origin source path. This poses a problem with some of our repositories since they're not placed in their original paths, and may include hard references to pb headers assuming the original directory. Typical use of this will be to place a LOCAL_PROTOC_OUTPUT := <original repo path> line in the relevant module block (for example, "hardware/ril" for our "hardware/ril-caf") Change-Id: Ib9b0cadd47e29a0d2e693b331cfc18e71b048ee5
* build/core: Inherit vendor/* makefiles for check-api.Adnan Begovic2015-10-091-1/+2
| | | | Change-Id: I72d409075192b18c35068566c5687092d45be9b4
* build: Add IGNORE_SUBDIR to clear vars.Adnan Begovic2015-10-091-0/+2
| | | | Change-Id: Icc539d6d4e0a2d5a025416841dc05fe6bcb6199f
* Add LOCAL_NO_LIBGCC.Ying Wang2015-07-161-0/+1
| | | | | | | | This can be used to compile independent libraries without the need for libgcc.a. Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374 (cherry picked from commit 75011b2003733edc483a45d61f5cb1a23f64bfbf)
* Don't extract jni from prebuilt apks.Ying Wang2015-06-011-1/+0
| | | | | | | | | | | | | | | | | | | | - 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
* Revert "Don't extract jni from prebuilt apks."Ying Wang2015-05-041-0/+1
| | | | | | | | This reverts commit 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67. Bug: 20810492 Bug: 20811499 Change-Id: Ic922d9daccc4550db489c0f3d4ad6b4ff85b5e60
* Don't extract jni from prebuilt apks.Ying Wang2015-05-011-1/+0
| | | | | | | | | | | | | | | | | | | | - 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/+1
|\ | | | | | | | | | | | | tables for dynamic executables" * commit '6f2935dc1432a38e149498b6efbd43ed9aceb827': Pack relocation tables for dynamic executables
| * am c84b3a78: am 648f1b66: Merge "Pack relocation tables for dynamic executables"Dmitriy Ivanov2015-04-231-0/+1
| |\ | | | | | | | | | | | | * commit 'c84b3a781c0065cba994e8cdd49b6bdb51e93399': Pack relocation tables for dynamic executables
| | * Pack relocation tables for dynamic executablesDmitriy Ivanov2015-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | relocation tables for all dynamic executables"" * commit '893ed24dd7cec9b560fe46862b3635efa327ec65': Revert "Pack relocation tables for all dynamic executables"
| * | am 941d61de: am 1ff47c7f: Merge "Revert "Pack relocation tables for all ↵Dimitry Ivanov2015-04-231-1/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | dynamic executables"" * commit '941d61decc24cc28c781d0593b2a5d0589b4a7ad': Revert "Pack relocation tables for all dynamic executables"
| | * Revert "Pack relocation tables for all dynamic executables"Dimitry Ivanov2015-04-231-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit e7a1b8a0c6d5f56e415345a0aceef3afe5ff5eff. Change-Id: I1a2185e1c68d364941e3b3e525a8c4a7a42e0cc1
* | | am ff084258: am b7b27621: am 64119a7f: am ec6a9773: Merge "Pack relocation ↵Dmitriy Ivanov2015-04-231-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | tables for all dynamic executables" * commit 'ff084258ea53c414d724ba87f89c324056def1bd': Pack relocation tables for all dynamic executables
| * | am 64119a7f: am ec6a9773: Merge "Pack relocation tables for all dynamic ↵Dmitriy Ivanov2015-04-231-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | executables" * commit '64119a7ff23960615c607306c9190c1def622d23': Pack relocation tables for all dynamic executables
| | * Pack relocation tables for all dynamic executablesDmitriy Ivanov2015-04-221-0/+1
| | | | | | | | | | | | | | | Bug: http://b/18051137 Change-Id: I277277d5f5eb450ef9b4a23cfec16d75d977eb89
* | | resolved conflicts for merge of 6cb3732d to masterDmitriy Ivanov2015-04-201-1/+0
|\ \ \ | |/ / | | | | | | Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
| * | am baca453a: am 5beb3387: Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"Dmitriy Ivanov2015-04-201-1/+0
| |\ \ | | |/ | | | | | | | | | * commit 'baca453a7d23fb2cf8a38d8aad3addbfce362afc': Remove unsupported *_COMPRESS_MODULE_SYMBOLS
| | * Remove unsupported *_COMPRESS_MODULE_SYMBOLSDmitriy Ivanov2015-04-201-1/+0
| | | | | | | | | | | | Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
* | | am a6c44859: am bc671bc6: am e3aa1c1f: Merge "Remove ↵Dmitriy Ivanov2015-04-171-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" * commit 'a6c44859c5344d489526641ce5a08598254da57b': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
| * | am bc671bc6: am e3aa1c1f: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"Dmitriy Ivanov2015-04-171-1/+0
| |\ \ | | |/ | | | | | | | | | * commit 'bc671bc65ee8db4ba0bba33543d41d372f424f9d': Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
| | * Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONSDmitriy Ivanov2015-04-171-1/+0
| | | | | | | | | | | | | | | | | | Use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES instead. Change-Id: Id30529fbc1652d066e0008813352848b5e404ab9
* | | am 3bc25d69: am 683a387e: am 4ed95088: Merge "Add support for ubsan."Dan Albert2015-04-151-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102': Add support for ubsan.
| * | am 683a387e: am 4ed95088: Merge "Add support for ubsan."Dan Albert2015-04-151-0/+1
| |\ \ | | |/ | | | | | | | | | * commit '683a387efb079fefd3d2895875868b7c2a5a4a06': Add support for ubsan.
| | * Add support for ubsan.Dan Albert2015-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than adding LOCAL_UB_SANITIZER, LOCAL_THREAD_SANITIZER, etc for each new sanitizer, deprecate LOCAL_ADDRESS_SANITIZER in favor of LOCAL_SANITZE that mirrors the behavior of -fsanitize=<sanitizers>. For example, the following will use both asan and ubsan: LOCAL_SANITIZE := address undefined We'll leave LOCAL_ADDRESS_SANITIZER around for compatibility until we can clean up the tree. Change-Id: I8a62315129d4753f8e992584ca6db1e5dfdd4d2a
| * | am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.Ying Wang2015-03-141-0/+1
| |\ \ | | |/ | |/| | | | | | | * commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57': Support to configure and build multiple custom images.
| | * Support to configure and build multiple custom images.Ying Wang2015-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build additional images requested by the product makefile. This script gives the ability to build multiple additional images and you can configure what modules/files to include in each image. 1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile. PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles. Each makefile configures an image. For image configuration makefile foo/bar/xyz.mk, the built image file name will be xyz.img. So make sure they won't conflict. 2. In each image's configuration makefile, you can define variables: - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm" etc. - CUSTOM_IMAGE_PARTITION_SIZE - CUSTOM_IMAGE_FILE_SYSTEM_TYPE - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary accepted by BuildImage() in tools/releasetools/build_image.py. - CUSTOM_IMAGE_MODULES, a list of module names you want to include in the image; Not only the module itself will be installed to proper path in the image, you can also piggyback additional files/directories with the module's LOCAL_PICKUP_FILES. - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to the image. <dest> is relativ to the root of the image. To build all those images, run "make custom_images". Bug: 19609718 Change-Id: Ic73587e08503a251be27797c7b00329716051927 (cherry picked from commit 5fcf1094f9cf4d57c2598237f99621f254130d71)
* | | Merge commit '597cfdb' into mergeEtan Cohen2015-03-301-1/+1
|\ \ \ | | | | | | | | | | | | Change-Id: I4df718345626439ece9fdad242cccea7d6930819
| * | | Add support for PB_ENABLE_MALLOC in nanopb-cWink Saville2015-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There will be two version of the the nanopb-c library, libnanopb-c-2.8.0 which doesn't support automatic malloc and libnanopb-c-2.8.0-enable_malloc which does. There will be two version of the the nanopb-c library, libnanopb-c-2.8.0 which doesn't support automatic malloc and libnanopb-c-2.8.0-enable_malloc which does. Set LOCAL_PROTO_OPTIMIZE_TYPE=nanopb-c which doesn't support malloc and set it to nanopb-c-enable_malloc which does. For client code details see nanopb-api: http://koti.kapsi.fi/jpa/nanopb/docs/reference.html Change-Id: If238412463aabb5e1d556dfc9c464bcaf9e3333a
| * | | nanopb-cWink Saville2015-03-111-1/+1
| | |/ | |/| | | | | | | Change-Id: I584d0a1e228338ea4ec3e5e2875d1ed329bc37f2
| * | Add support for prebuilt AARs.Ying Wang2014-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - You can give a .aar as source file to a prebuilt static Java library module. The build system will set up dependencies and rules to extract classes.jar and other resource files. - To build against a prebuilt AAR module, use: LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs> The build system will set up rules to merge the library's AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's resource dirs and link/merge the AAR's classes.jar. Bug: 18168693 Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2 (cherry picked from commit e9dd9f2bfceed3b5f630b0edbe3feb7f34548d8b)
* | | Support to configure and build multiple custom images.Ying Wang2015-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build additional images requested by the product makefile. This script gives the ability to build multiple additional images and you can configure what modules/files to include in each image. 1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile. PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles. Each makefile configures an image. For image configuration makefile foo/bar/xyz.mk, the built image file name will be xyz.img. So make sure they won't conflict. 2. In each image's configuration makefile, you can define variables: - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm" etc. - CUSTOM_IMAGE_PARTITION_SIZE - CUSTOM_IMAGE_FILE_SYSTEM_TYPE - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary accepted by BuildImage() in tools/releasetools/build_image.py. - CUSTOM_IMAGE_MODULES, a list of module names you want to include in the image; Not only the module itself will be installed to proper path in the image, you can also piggyback additional files/directories with the module's LOCAL_PICKUP_FILES. - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to the image. <dest> is relativ to the root of the image. To build all those images, run "make custom_images". Bug: 19609718 Change-Id: Ic73587e08503a251be27797c7b00329716051927
* | | Allow to pass arguments to JillYohann Roussel2015-03-051-0/+1
| | | | | | | | | | | | | | | Bug: 19026410 Change-Id: I3f3d7c0e7f8d6cc7150ae560b8734093798e8299
* | | am 738871f6: am e886392c: am 37a44faa: Merge "Store native libs aligned to ↵Narayan Kamath2015-02-261-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | PAGE_SIZE" * commit '738871f6eb3c372b60928e761f0dc24e46a6bba5': Store native libs aligned to PAGE_SIZE
| * | am 37a44faa: Merge "Store native libs aligned to PAGE_SIZE"Narayan Kamath2015-02-261-0/+2
| |\ \ | | | | | | | | | | | | | | | | * commit '37a44faa7266c8a7e0cc5077a4c028d6f5bfa7f7': Store native libs aligned to PAGE_SIZE
| | * | Store native libs aligned to PAGE_SIZEDmitriy Ivanov2015-02-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a new flag to zipalign (-p) that page aligns shared libraries (zip entries ending with ".so") in the archive. - Add a new build variable LOCAL_PAGE_ALIGN_SHARED_LIBRARIES to turn on this behaviour in zipalign. - Add a new LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS to control zip behaviour. Bug: 8076853 Bug: 19330157 Co-Authored-By: Simon Baldwin <simonb@google.com> Co-Authored-By: Dimitry Ivanov <dimitry@google.com> Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* | | | Engage Jack incremental on demandYohann Roussel2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each module may engage Jack incremental with LOCAL_JACK_ENABLED := incremental Include renaming of LOCAL_USE_JACK to LOCAL_JACK_ENABLED that is now accepting 3 values "disabled", "full" and "incremental". Change-Id: Icbff275b397bee36b29312e821f3e8d45f83fbcc
* | | | Simplify handling of ANDROID_JACK_* variablesYohann Roussel2015-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This concerns ANDROID_JACK_VM, ANDROID_JACK_VM_ARGS and ANDROID_JACK_EXTRA_ARGS. Change-Id: Iba75ecaaceb09ac9607a3aee41324d9f5ae4beef
* | | | am 7c05897b: am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."Ying Wang2015-01-291-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7c05897b69801e1945889a9b1a89b86bbbbbdd3a': Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
| * | | am e937ac81: Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."Ying Wang2015-01-291-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e937ac814c7f4e1989509f94f7ac8ae5b28a3526': Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.
| | * | Add new build flag LOCAL_DONT_DELETE_JAR_DIRS.Fredrik Roubert2015-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally the build function initialize-package-file will delete all class files and all directory entries from JAR files, but sometimes external projects (eg. ICU4J) depend on having directory entries in their JAR files. This change adds the flag LOCAL_DONT_DELETE_JAR_DIRS (analogous to the flag LOCAL_DONT_DELETE_JAR_META_INF) which when set will skip deletion of directory entries in initialize-package-file. Change-Id: I4464b947b7528fca23925affa95e4071915f04d4
* | | | Merge "Compile using Jack."Yohann Roussel2014-12-041-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Compile using Jack.Yohann Roussel2014-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to compile dex targeted java sources using Jack and Jill. Default is still to compile with the legacy toolchain. Default can be switched to the new toolchain by setting environement variable: export ANDROID_COMPILE_WITH_JACK=true Toolchain can also be forced for one module by defining LOCAL_USE_JACK:=true # false in the mk portion defining the module. Jack execution environement can be controlled with: Global variable ANDROID_JACK_VM allow to change the jvm executing Jack. Global variable ANDROID_JACK_VM_ARGS allows to change default args given to the jvm. Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args to give to Jack LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for the module. LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack. Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
* | | | am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."Stephen Hines2014-12-021-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '4bad2d2156bcb589c2d1bb223a074edc39aa428c': Add more support for GLOBAL_CONLYFLAGS.
| * | Add more support for GLOBAL_CONLYFLAGS.Stephen Hines2014-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | This will be necessary to support -std=gnu99 mode for clang 3.6, which defaults to C11 mode (unlike prior releases that use C99). Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
| * | resolved conflicts for merge of 3907c03e to lmp-dev-plus-aospYing Wang2014-10-091-0/+1
| |\ \ | | | | | | | | | | | | Change-Id: I580ab0693609ff506da7346548a45322000114d1
| * \ \ am 14012488: am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*."Chih-Hung Hsieh2014-09-301-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '140124884050264721e22cb08f713a7da76b36d4': Clear all LOCAL_CLANG_*FLAGS*.
| * \ \ \ am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags."Chih-Hung Hsieh2014-09-271-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9b2d21c04d0ba65ad56a26f8306e9afa7d99694': Add local Clang+target specific flags.
| * \ \ \ \ resolved conflicts for merge of 326f9450 to lmp-dev-plus-aospDan Albert2014-09-241-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
generated by cgit v1.1 at 2024-05-27 05:14:48 +0000