summaryrefslogtreecommitdiffstats
path: root/core/clear_vars.mk
Commit message (Collapse)AuthorAgeFilesLines
* Add tool to package up built modules.Ying Wang2014-05-051-0/+1
| | | | | | | | | | | | | With this change, you can package up modules while avoiding installing them to the system.img or userdata.img. - build/core/tasks/tools/package-modules.mk You can use this template to package up modules into a zip file and preserve the installed file paths. - LOCAL_PICKUP_FILES, you can use this variable to package up extra files/directories. Bug: 13585955 Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
* Set up rules to build oem.imgYing Wang2014-04-281-0/+1
| | | | | | | | | | | | To build oem.img: - You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk - The file system type will be the same as system.img and userdata.img. - To install a module to oem.img, use "LOCAL_OEM_MODULE := true" - run "make -j48 showcommands oem_image dist". By default it's not built. Bug: 13367676 Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
* Support to extract JNI libs from prebuilt APKYing Wang2014-04-181-0/+1
| | | | | | | | | | | | | | | | | Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted from the prebuilt apk, or prebuilts as source, to the app specific lib path. LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files: - Files like @path/to/libfoo.so (path inside the apk) are JNI libs extracted from the prebuilt apk. In this case, all embedded JNI libs inside the prebuilt apk are stripped. - Files like path/to/libfoo.so (path relative to LOCAL_PATH) are prebuilts in the source tree. Those prebuilt JNI libs are not defined as modules in the build system, so this works around possible module name conflict. Bug: 13170859 Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
* am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"Colin Cross2014-04-121-1/+0
|\ | | | | | | | | * commit '25313cd32a78108945d65144399fc292350e9e0a': build: remove LOCAL_NO_2ND_ARCH
| * am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"Colin Cross2014-04-121-1/+0
| |\ | | | | | | | | | | | | * commit '59cc3f5d2a65d1114b0643c453af8b9249970dfd': build: remove LOCAL_NO_2ND_ARCH
| | * build: remove LOCAL_NO_2ND_ARCHColin Cross2014-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | Delete LOCAL_NO_2ND_ARCH, it is no longer used. Equivalent functionality is available with LOCAL_MULTILIB := first. Change-Id: I36838a8a7e10b0a59ca0022c4c8a3a190e782c71
* | | am 441e9452: resolved conflicts for merge of f3e25fea to ↵Colin Cross2014-03-271-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '441e9452488ccb98f7b0a7690b86fcdff733e5f0': add support for LOCAL_MULTILIB
| * | resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aospColin Cross2014-03-261-0/+1
| |\ \ | | |/ | | | | | | Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e
| | * add support for LOCAL_MULTILIBColin Cross2014-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH, although both are still supported. Set LOCAL_MULTILIB := 32 to always build a module 32-bit. This is the same as specifying LOCAL_32_BIT_ONLY. Set LOCAL_MULTILIB := first to always build a module for the first architecture (64-bit on a 64-bit target, 32-bit on a 32-bit target). This is the same as specifying LOCAL_NO_2ND_ARCH. Set LOCAL_MULTILIB := both to build for both architectures on a mulitlib (64-bit) target. If LOCAL_MULTILIB is not set libraries will default to "both", and executables, packages, and prebuilts will default to building for the first architecture if supported by the module, otherwise the second. Executables that set LOCAL_MULTILIB := both must set either LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to differentiate the install locations of the two versions. Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
* | | Merge "Temporarily use a separate var for including shared resources"Adam Lesinski2014-03-261-0/+1
|\ \ \
| * | | Temporarily use a separate var for including shared resourcesAdam Lesinski2014-03-251-0/+1
| | | | | | | | | | | | | | | | Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
* | | | am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-251-0/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | * commit '8295d6cd62ba73ea66e64204d2d0ea27b4b34889': add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
| * | am ce087413: am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-251-0/+4
| |\ \ | | |/ | | | | | | | | | | | | * commit 'ce08741397e0468185457f5c7e8aee08272e6752': add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
| | * add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64Colin Cross2014-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some executables will need to be built for both 32-bit and 64-bit. For linker/linker64, debuggerd/debuggerd64, and a few more, they will be installed in the same path (/system/bin), but with different filenames. Allow the module to specify LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 to name the two versions. Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
| | * add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64Colin Cross2014-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some executables will need to be built for both 32-bit and 64-bit. For tests, it will be convienient to keep the name of the executable the same, but install them in a different location. Add LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module to specify different paths for 32-bit and 64-bit executables. Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
* | | am 1bd53e59: am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused ↵Ying Wang2014-03-181-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | LOCAL_ASSET_FILES." * commit '1bd53e59558f7973a038f4b0d5c78a7fdfa45f91': Remove unused LOCAL_ASSET_FILES.
| * | am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."Ying Wang2014-03-181-1/+0
| |\ \ | | |/ | | | | | | | | | * commit '5462f7f953915bd345a58b17977e79e6405b56d0': Remove unused LOCAL_ASSET_FILES.
| | * Remove unused LOCAL_ASSET_FILES.Ying Wang2014-03-181-1/+0
| | | | | | | | | | | | Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
* | | am 4048cf3a: am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"Colin Cross2014-02-141-0/+14
|\ \ \ | |/ / | | | | | | | | | * commit '4048cf3a70dd6405f7ff08b8a3d714d1a7b7d446': don't use LOCAL_*_arch for host builds
| * | am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"Colin Cross2014-02-141-0/+14
| |\ \ | | |/ | | | | | | | | | * commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f': don't use LOCAL_*_arch for host builds
| | * don't use LOCAL_*_arch for host buildsColin Cross2014-02-131-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LOCAL_*_$(TARGET_ARCH) variables don't make sense for host modules, only append use them for target modules. Also complete the list of LOCAL_*_arch and LOCAL_*_32/64 to be consistent. Change-Id: I00c83e5c4e08ed9a844f9f99a79ce4bcc3f0bf11
* | | am 2c32144b: resolved conflicts for merge of 7cd7bd65 to ↵Colin Cross2014-02-121-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e': HACK: add 64-bit directory blacklist add support for module supported or unsupported target architectures
| * | resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aospColin Cross2014-02-121-0/+4
| |\ \ | | |/ | | | | | | Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
| | * add support for module supported or unsupported target architecturesColin Cross2014-02-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add four new variables for module makefiles: LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for one or more architectures. Any architecture not in the list will be not attempt to build the module. The expected use case is prebuilts that are only suitable for a single architecture, or modules like llvm that need per-architecture support. LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be built for one or more architectures. LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN are the same, but warn that the arch is not supported, which is useful for modules that are critical but not yet working. The logic for whether or not to build an architecture is fairly complicated, so this patch consolidates it into module_arch_supported.mk Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
* | | am 74b71317: am 2d72094f: am 960d919e: resolved conflicts for merge of ↵Ying Wang2014-02-101-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4df82b3e to klp-dev-plus-aosp * commit '74b71317711fe4bacc6422e45de599fea840f061': Allow proguarding the main app and the test app in a single run.
| * | am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to ↵Ying Wang2014-02-081-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | klp-dev-plus-aosp * commit '2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb': Allow proguarding the main app and the test app in a single run.
| | * \ am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-081-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '960d919e814726f05ad1a9b82e6a9677f9977f15': Allow proguarding the main app and the test app in a single run.
| | | * \ resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-081-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
| | | | * | Allow proguarding the main app and the test app in a single run.Mihail Dumitrescu2014-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12895101 Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
* | | | | | am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmlsYing Wang2014-02-061-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '69c3f4570d80eab99bfcab604209dc7bb3ae5537': Set up rules to merge AndroidManifest.xmls
| * | | | | am dc7fee9f: Set up rules to merge AndroidManifest.xmlsYing Wang2014-02-061-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | * commit 'dc7fee9fbf46ac06c840c7edfd51fbefeece63e4': Set up rules to merge AndroidManifest.xmls
| | * | | Set up rules to merge AndroidManifest.xmlsYing Wang2014-02-051-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can merge the library manifest files to the main app's AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES. LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of the source tree. Bug: 12907528 Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
* | | | am d69ed2e2: am 054b0274: Merge topic \'arm64\'Colin Cross2014-02-061-0/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit 'd69ed2e25c59803bbbbbee7c09551efb3ed0c49d': add support for more LOCAL_*_arch variables don't rename 32-bit executables to *_32 remove 2nd arch from ARCH_ARM_* defines
| * | | add support for more LOCAL_*_arch variablesColin Cross2014-02-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for: LOCAL_SHARED_LIBRARIES_arch LOCAL_STATIC_LIBRARIES_arch LOCAL_WHOLE_STATIC_LIBRARIES_arch LOCAL_GENERATED_SOURCES_arch LOCAL_REQUIRED_MODULES_arch Change-Id: Iad91702e140d8dba7dcaee13f236c77b1e626a34
* | | | am 6a7699d5: am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to ↵Colin Cross2014-01-311-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | LOCAL_32_BIT_ONLY" * commit '6a7699d5c62d1696305f8debf4c0f90a34ad6009': build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
| * | | build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLYColin Cross2014-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Rename for consistency with TARGET_IS_64_BIT. Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
* | | | am df313a04: am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"Colin Cross2014-01-311-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'df313a04a1f5e4e7f3cdc626f7c571a6d12b4dec': build: support LOCAL_*_32 and LOCAL_*_64
| * | | build: support LOCAL_*_32 and LOCAL_*_64Colin Cross2014-01-291-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the following new variables based on whether the current multilib target is 32 bit or 64 bit: LOCAL_CFLAGS_32 LOCAL_CFLAGS_64 LOCAL_LDFLAGS_32 LOCAL_LDFLAGS_64 LOCAL_ASFLAGS_32 LOCAL_ASFLAGS_64 LOCAL_C_INCLUDES_32 LOCAL_C_INCLUDES_64 Change-Id: Ia868d56dff114be301bf8297eec768675f186927
* | | am 8c89a9ff: am 4695598d: am ae49acbd: am 1acb1b64: Merge changes ↵Colin Cross2014-01-271-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | I62504bad,I16208cca,I4e4ceec6 * commit '8c89a9ff9cd461e4bc077a91a0c7c32b17a92ebd': add new gen/ directory for generated sources warn on LOCAL_MODULE_PATH in multiarch shared libraries Support LOCAL_MODULE_RELATIVE_PATH
| * | Support LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most users of LOCAL_MODULE_PATH are setting a subdirectory of the normal install path, for example to install HALs into system/lib/hw. This is problematic for multiarch builds, where the install location depends on the arch. Allow modules to specify LOCAL_MODULE_RELATIVE_PATH. HALs will generally use: LOCAL_MODULE_RELATIVE_PATH := hw Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | | am f23971ed: am 3512ed49: am f2777de6: am 18294fbf: Merge "Support ↵Ying Wang2014-01-271-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | arch-specific LOCAL_C_INCLUDES." * commit 'f23971ede66991f20e5ea24411872b0a296d82f8': Support arch-specific LOCAL_C_INCLUDES.
| * | Support arch-specific LOCAL_C_INCLUDES.Ying Wang2014-01-271-0/+2
| | | | | | | | | | | | | | | Bug: 11654773 Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
| * | Support arch-specific LOCAL_ variablesYing Wang2014-01-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With those variables, you can set up different values for TARGET_ARCH and TARGET_2ND_ARCH. Also fixed a couple of variables. Bug: 11654773 Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b Conflicts: core/base_rules.mk
| * | Support to build executables for TARGET_2ND_ARCHYing Wang2014-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, an executable is built for TARGET_ARCH. To build it for TARGET_2ND_ARCH in a 64bit product, use: LOCAL_32BIT_ONLY := true To skip a module for TARGET_2ND_ARCH, use: LOCAL_NO_2ND_ARCH := true Bug: 11654773 Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
| * | Set up rules to build static libraries for TARGET_2ND_ARCHYing Wang2014-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of static_library_internal.mk. libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a. Bug: 11654773 Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
* | | Support arch-specific LOCAL_ variablesYing Wang2014-01-231-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | With those variables, you can set up different values for TARGET_ARCH and TARGET_2ND_ARCH. Also fixed a couple of variables. Bug: 11654773 Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b
* | | Support to build executables for TARGET_2ND_ARCHYing Wang2014-01-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, an executable is built for TARGET_ARCH. To build it for TARGET_2ND_ARCH in a 64bit product, use: LOCAL_32BIT_ONLY := true To skip a module for TARGET_2ND_ARCH, use: LOCAL_NO_2ND_ARCH := true Bug: 11654773 Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
* | | Set up rules to build static libraries for TARGET_2ND_ARCHYing Wang2014-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules for the 2nd arch are set up in the second inclusion of static_library_internal.mk. libfoo of the 2nd arch will be built into $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a. Bug: 11654773 Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
* | | am e6036aa6: am c4f4a532: am 14af5526: am c4c71f06: Merge "Remove aprof ↵Ying Wang2014-01-141-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | support from the build system." * commit 'e6036aa6ff8cde9fad959ed42bec8cce0350c5e6': Remove aprof support from the build system.
| * | Remove aprof support from the build system.Ying Wang2014-01-141-2/+0
| | | | | | | | | | | | | | | | | | This reverts the commit 70dc3e1d. Change-Id: I480b005579805d2608d05dac41e32bb44642e813
generated by cgit v1.1 at 2024-09-17 02:32:21 +0000