summaryrefslogtreecommitdiffstats
path: root/core/product_config.mk
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 3907c03e to lmp-dev-plus-aospYing Wang2014-10-091-0/+18
|\ | | | | | | Change-Id: I580ab0693609ff506da7346548a45322000114d1
| * Introduce per-product per-module dex-preopt configYing Wang2014-10-081-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat. - Added macro add-product-dex-preopt-module-config to specify almost arbitrary dex-preopt config/flags to modules in product configuration: $(call \ add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>) How <config_or_flags> is interpreted is decided by dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we disable dexpreopt for the given modules; otherwise pass it to dex2oat as command line flags. - If there are multiple configs for the same module in the product inheritance, the first takes precedence. - Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default dex2oat flags in product configuration. - Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat. Bug: 17791867 Change-Id: I1b2955e8e51039e94d1ff43a3265a8d03598632c
* | Add anydpi to all product configsAdam Lesinski2014-08-261-2/+2
| | | | | | | | Change-Id: Ia5e0834c585891de58e5daf3473563ab64dba74c
* | Remove services, wifi, ethernet from BOOTCLASSPATH.Narayan Kamath2014-08-121-0/+1
| | | | | | | | | | | | | | | | They belong to the system_server classpath. bug: 16555230 Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
* | am 7a6a9a55: am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt ↵Ying Wang2014-06-271-0/+7
|\ \ | |/ | | | | | | | | | | parameter for builds." * commit '7a6a9a558271ac959a2e441fe27aae3df77d4421': Add --pseudo-localize aapt parameter for builds.
| * Add --pseudo-localize aapt parameter for builds.Igor Viarheichyk2014-06-261-0/+7
| | | | | | | | | | | | | | | | | | | | Some packages can override list of locales with LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling pseudolocalization. Adding new --pseudo-localize flag to aapt if pseudo-locales are specified in product locales list solves this issue. Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
* | am 2d19cbd2: resolved conflicts for merge of 135e11df to ↵Ying Wang2014-06-111-2/+0
|\ \ | |/ | | | | | | | | | | klp-modular-dev-plus-aosp * commit '2d19cbd279ed69c7202f089be174c35c1585f709': Switch to 32-bit-by-default host multilib build.
| * Switch to 32-bit-by-default host multilib build.Ying Wang2014-06-091-2/+0
| | | | | | | | | | | | | | | | Also we don't need to force LLVM built from source, for we already force LLVM to be built as 32-bit. Bug: 13751317 Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
| * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 7e127ebe0bf8753fcbeeac6140916d512322e308) Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
* | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | | | | | | | | Bug: 14298175 Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
* | am e50f2d9f: am 40b49d30: am a74ade94: Merge "Support host multilib build"Ying Wang2014-05-151-1/+1
|\ \ | |/ | | | | | | * commit 'e50f2d9f32a27d8290692dbf99ab8b247ef9d553': Support host multilib build
| * Support host multilib buildYing Wang2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change basically ported our target multilib to the host side. It supports 2 host build modes: x86 and x86_64 multilib build. For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64 multilib build. Later we'll default to x86_64 build and have a flag to force 32-bit only build, which may be needed by SDK build. In host module definition, like in target ones, you can use the following LOCAL variables to set up multilib configuration: LOCAL_MULTILIB: can be "both", "first", "32" or "64". It also supports the same set of arch or 32-vs-64 specific LOCAL variables. By default, it builds only for the first arch. To keep path compatibility, in x86_64 build files are still output to out/host/linux-x86; Both 32-bit and 64-bit executables are in out/host/linux-86/bin; In x86_64 build 32-bit shared libraries are installed to out/host/linux-x86/lib32 and 64-bit shared libraries are installed to out/host/linux-x86/lib; 32-bit object files are output to out/host/linux-x86/obj32 and 64-bit object files are output to out/host/linux-x86/obj. Bug: 13751317 Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
| * build: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
| | | | | | | | | | Bug: 12798969 Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
* | am 1fee45f1: am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."Ian Rogers2014-01-311-0/+2
|\ \ | |/ | | | | | | * commit '1fee45f1af82d9dbb2e709413f020b2291205640': Disable WITH_HOST_DALVIK on 64bit host builds.
| * Disable WITH_HOST_DALVIK on 64bit host builds.Ian Rogers2014-01-301-0/+2
| | | | | | | | Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
* | build: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
| | | | | | | | | | | | | | | | Bug: 12798969 (cherry picked from commit 49f1fab8a5b82f6224ff1be601037270ecdb734b) Change-Id: I7f211fca2b9c99b607dd91590a3e4a82501e0c7f
* | resolved conflicts for merge of 1737b1ab to masterBrian Carlstrom2014-01-281-0/+4
|\ \ | |/ | | | | Change-Id: I5a5f2e83c5155c1c783711f736c60198a8f404ee
| * build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATABrian Carlstrom2014-01-281-0/+4
| | | | | | | | | | | | (cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175) Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
* | am a292b7b0: am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS ↵Ying Wang2014-01-081-1/+1
|\ \ | |/ | | | | | | | | | | as a list of jar names separated by space" * commit 'a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2': PRODUCT_BOOT_JARS as a list of jar names separated by space
| * PRODUCT_BOOT_JARS as a list of jar names separated by spaceYing Wang2014-01-071-1/+1
| | | | | | | | | | | | | | This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their product configuration files. Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
* | am 03a06f41: am 9507a0fd: am 82c59aef: am 71e8a22e: Merge "Add DEXPREOPT ↵Ying Wang2013-12-181-0/+11
|\ \ | |/ | | | | | | | | | | support for ART" * commit '03a06f4158e9eea9152f25286fcf2c30044d4e06': Add DEXPREOPT support for ART
| * Add DEXPREOPT support for ARTBrian Carlstrom2013-12-171-0/+11
| | | | | | | | Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
* | Keep a copy of the space-separated PRODUCT_AAPT_CONFIGYing Wang2013-11-221-1/+3
|/ | | | | | That can be used to select dpi-specific prebuilt apks. Change-Id: Ic68be8fc6fdb46f3ff8de490a35a042a31f1cb19
* Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATHYing Wang2013-07-241-0/+3
| | | | | | | | | - BOOTCLASSPATH now is product-configurable; - No need to maintain the duplicate values in core/dex_preopt.mk. - clean up some legacy ALL_PREBUILTs. Bug: 9990214 Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
* Bring in runtime-specific product variables in a more general way.Ying Wang2013-07-101-26/+27
| | | | Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
* Move from WITH_ART to PRODUCT_RUNTIMESBrian Carlstrom2013-06-271-9/+26
| | | | Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
* Add WITH_ARTBrian Carlstrom2013-05-221-0/+4
| | | | | | (cherry picked from commit 6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f) Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
* am 2d17b1ab: resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aospElliott Hughes2012-10-031-1/+1
|\ | | | | | | | | | | | | * commit '2d17b1aba6ea529dc618d50c784f69fb7f1a8141': Build only modules required by the current product. Load only the current product config makefile. Run clean steps in only given paths when using mm/mmm
| * resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aospElliott Hughes2012-10-031-1/+1
| |\ | | | | | | | | | Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
| | * Load only the current product config makefile.Ying Wang2012-10-031-17/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To reduce the start time. With the change and previous change of doing clean step in only given paths, start time of mm/mmm is reduced from ~5s to about 1s; lunch time is reduced from ~40s to 3.5s. (cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.) Bug: 7186768,7169854 Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b
* | | am 318330dd: am 9acbbf12: am 76a6dc3a: Fix common typo in comments, warning ↵Ian Rogers2012-10-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | and error messages. * commit '318330dd920977733f20eeda338d3c36892373f6': Fix common typo in comments, warning and error messages.
| * | Fix common typo in comments, warning and error messages.Ian Rogers2012-10-011-1/+1
| | | | | | | | | | | | | | | | | | s/can not/cannot/g Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
| * | Load only the current product config makefile.Ying Wang2012-09-281-17/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To reduce the start time. With the change and previous change of doing clean step in only given paths, start time of mm/mmm is reduced from ~5s to about 1s; lunch time is reduced from ~40s to 3.5s. Bug: 7186768,7169854 Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
* | | Remove build variant "tests"Ying Wang2012-10-011-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5368571 Now we have a phony target "tests" instead. The target can be built in any other build variant (eg userdebug). For example, "make PRODUCT-full-userdebug tests dist" will build and put the *-test-* zip file in the dist dir. The "tests" target will include all modules tagged as "tests" in addition to other modules in specific target out directories. Change-Id: I8383097380d8e6846c3e2107d6dd5f68788cfc39
* | | Load only the current product config makefile.Ying Wang2012-09-271-17/+53
|/ / | | | | | | | | | | | | | | | | | | To reduce the start time. With the change and previous change of doing clean step in only given paths, start time of mm/mmm is reduced from ~5s to about 1s; lunch time is reduced from ~40s to 3.5s. Bug: 7186768,7169854 Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
* | Allow to tag owner to PRODUCT_COPY_FILESYing Wang2012-09-201-5/+6
|/ | | | | | | | | PRODUCT_COPY_FILES now is a list of words like <source path>:<destination path>[:<owner>]. The optional :<owner> is used to indicate the owner of a vendor file. Bug: 7048854 Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
* Dump the user tagged modules.Joe Onorato2012-08-161-0/+6
| | | | Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
* core: allow product to provide kernel headers as wellDima Zavin2012-03-191-0/+4
| | | | | | | | | | This is useful when a device inherits from an architecture product, such as omap4.mk. The architecture specific product can provide kernel headers to all the devices that use that architecture. Change-Id: I0c9d3120a6089fb535a3fa8eccf10775a271cd21 Signed-off-by: Dima Zavin <dima@android.com>
* am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.Dianne Hackborn2011-10-171-0/+4
|\ | | | | | | | | * commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3': New PRODUCT_AAPT_PREF_CONFIG.
| * New PRODUCT_AAPT_PREF_CONFIG.Dianne Hackborn2011-10-141-0/+4
| | | | | | | | | | | | | | | | To use the new aapt --preferred-configurations option. For use with Prime to be able to strip everything but xhdpi density bitmaps selectively, not stripping when this would result in no data for the resource. Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
* | Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.Ying Wang2011-10-101-4/+0
|/ | | | | Bug: 5433204 Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
* Support for product-specific dev keys.Ying Wang2011-10-041-14/+23
| | | | Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-13/+0
| | | | | | Bug: 5010576 Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
* Fix tab.Ying Wang2011-06-171-1/+1
| | | | | | The tab broke unbundled targets. Change-Id: Ia97d4bdd69f7bb48eb3c51a01f0ab7085b5949a0
* fix broken build rules for host VM.Ryo Fujii2011-06-171-11/+21
|
* Add support for products overriding properties in /default.propMike Lockwood2011-06-091-0/+6
| | | | | | | | | | | | | | We need this to allow products to specify the default USB configuration, and allow the build system to add adb to this configuration for eng and userdebug builds. For example: PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388 Signed-off-by: Mike Lockwood <lockwood@android.com>
* Clean up how dex preoptimization gets configured.Dan Bornstein2011-05-311-9/+0
| | | | Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
* am 095dbffd: am 5d4808db: put extra recovery keys in the product definitionDoug Zongker2011-03-161-0/+4
|\ | | | | | | | | * commit '095dbffd605eb1bb602b028000aab4494288c6f6': put extra recovery keys in the product definition
| * put extra recovery keys in the product definitionDoug Zongker2011-03-161-0/+4
| | | | | | | | Change-Id: I71637cd578b24891c10171aa59406848649be703
* | Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIGYing Wang2011-03-151-8/+9
|/ | | | | | | | | With this change, PRODUCT_LOCALES will contain only locales. Other aapt config flags, such as *dpi, small/normal/large/xlarge, should go to PRODUCT_AAPT_CONFIGS. Bug: 4086309 Change-Id: I922f153d79777a9522c542a3907111193b40e7b7