summaryrefslogtreecommitdiffstats
path: root/core/product.mk
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Add PRODUCT_BOOTANIMATION"Luca Stefani2017-01-051-1/+0
| | | | | | | | | | | Replace this with TARGET_BOOTANIMATION as part of the rework of the boot animation generation process in vendor/cm change Iee32f18440ff955d13ed85b273e97cbd540721fc. This reverts commit b2483ae08c00c42bd97f3b9e2ba5e841ec243d62. Change-Id: Id6fc55ee1bc0149f25e6165a3e5f3209ad4424fc (cherry picked from commit 74b511974651cbbcffd6e472777d33b4bf9ae5bc)
* build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE"Edward Wang2016-04-151-0/+1
| | | | | Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c Ticket: FEIJ-62
* Preventing default locale from being overridden because of buildinfo.shAbhishek G2016-04-051-0/+3
| | | | | | | | | Adding the ability to set default locale from the device tree. Adding the TARGET_SKIP_DEFAULT_LOCALE flag which can be set in the device tree, thus preventing buildinfo.sh from overriding default locale. Change-Id: I66bcedb42216acee56ceaf657a39dc23d7eea6f4 Issue-Id: FEIJ-22
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-0/+1
|\ | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: core/Makefile core/build_id.mk tools/releasetools/ota_from_target_files.py Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c
| * vboot_signer: Add kernel subkey required for signing kernel keyblockFurquan Shaikh2015-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the keyblock was being generated using data_key.vbprivk. However, we need to use kernel_subkey.vbprivk for kernel keyblock generation. This did not create any issues until now because dev-mode just throws a message saying that keyblock is invalid. But, normal-mode does not boot if keyblock is invalid. Add extra parameter for passing in kernel subkey to vboot_signer script. TEST="make bootimage-nodeps" generates correctly signed boot.img. Verified that the image boots fine in normal mode. Change-Id: I0fc2183b466e34ddf1d98c9532072548504fcec4 Signed-off-by: Furquan Shaikh <furquan@google.com>
* | Allow finer control over how product variables are inherited.Chris Sarbora2015-10-061-7/+56
| | | | | | | | | | Change-Id: I3abc22eea94293d1d0ebf0a81b396ebea0baf5a8 (cherry picked from commit 29357f5ea1dd8507f70efc330b2e5966d13504e8)
* | build: Add support for PRODUCT_COPY_FILES_OVERRIDESSteve Kondik2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | * We may have a case where prebuilts need to be built from source instead based on an externalized config. * New directive takes a list of destination files to remove from PRODUCT_COPY_FILES so that other instructions can be supplied. Change-Id: I7feff16440e54d1676ffddbbd96d5947efa43ede
* | Add PRODUCT_BOOTANIMATIONWilliam Roberts2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just add PRODUCT_BOOTANIMATION in your product makefiles and point it to the zip file you would like to have used as the boot animation. The coresponsing build system handles picking the last one, which is the last product to set this. Change-Id: I8c95a515a8fbb92d363141eb79e254712dccc162 Signed-off-by: William Roberts <wroberts@tresys.com> Fix for build break when PRODUCT_BOOTANIMATION is unset Change-Id: I236c2dd35ba0e632ed327ed6dc36324c9e59587a Restore original behavior when PRODUCT_BOOTANIMATION is undefined Change-Id: I3ee7141f7c26cee033b8a30824caf38fcacec5a8
* | add support for overriding build.prop settings.Koushik Dutta2015-10-061-0/+1
|/ | | | Change-Id: Ie4224d608b7bcb0c2087bd77bc954f8f5f9b6495
* resolved conflicts for merge of 6cb3732d to masterDmitriy Ivanov2015-04-201-1/+0
|\ | | | | | | Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
| * Remove unsupported *_COMPRESS_MODULE_SYMBOLSDmitriy Ivanov2015-04-201-1/+0
| | | | | | | | Change-Id: Ibb7da2997a0bb5b9f435213c9d3206bc4aad18db
| * resolved conflicts for merge of fc759204 to stage-aosp-masterMohamad Ayyash2015-03-041-0/+1
| |\ | | | | | | | | | Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
| | * Allow flashing a squashfs system imageMohamad Ayyash2015-03-031-0/+1
| | | | | | | | | | | | | | | Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | | Separate boot and recovery image signing from dm-veritySami Tolvanen2015-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow dm-verity to be enabled without boot and recovery images being signed. This makes it possible to enable only dm-verity to detect corruption without confusing bootloaders that do not understand signed images. Bug: 19985143 Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
* | | Add support to sign boot images with vboot.David Riley2015-03-261-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867 Signed-off-by: David Riley <davidriley@google.com> (cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
* | | Allow flashing a squashfs system imageMohamad Ayyash2015-03-031-0/+1
|/ / | | | | | | | | Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
* | am 876f45e7: Merge "Make some warnings impossible to override."Dan Albert2015-02-251-0/+4
|\ \ | |/ | | | | | | * commit '876f45e73f938cdaa7cfc25c43822fc6b274f105': Make some warnings impossible to override.
| * Make some warnings impossible to override.Dan Albert2015-02-231-0/+4
| | | | | | | | | | | | | | | | These CFLAGS and CPPFLAGS will always be added last, and are controlled by the build system. This way we can add warnings that users are not allowed to disable. Change-Id: Id71f69249078f62ca2687ecbf764aff0fd3a1c1b
* | resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aospYing Wang2015-02-041-2/+0
|\ \ | |/ | | | | Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
| * Remove support of factory ramdisk/bundle.Ying Wang2015-02-041-2/+0
| | | | | | | | | | Bug: 18779515 Change-Id: Ia6d51d43965447e2e95944a7d2b4b41adb121cb7
* | am ad6dd21e: Merge "Remove unused PRODUCT_TAGS"Brian Carlstrom2015-01-061-1/+0
|\ \ | |/ | | | | | | * commit 'ad6dd21e1ae27941b0c00629b095dd9a9ae2d7c2': Remove unused PRODUCT_TAGS
| * Remove unused PRODUCT_TAGSBrian Carlstrom2015-01-051-1/+0
| | | | | | | | | | Bug: 18895001 Change-Id: I2bbb1c04880218eaa06c1eff92280c636260f9ae
* | am 73a730ca: Merge "Remove libdvm support from the core build system."Ying Wang2014-12-161-1/+0
|\ \ | |/ | | | | | | * commit '73a730caf566fb778ad36f6d991666c482918d22': Remove libdvm support from the core build system.
| * Merge "Remove libdvm support from the core build system."Ying Wang2014-12-161-1/+0
| |\
| | * Remove libdvm support from the core build system.Ying Wang2014-12-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now libart is the only supported runtime and we don't need the build variables PRODUCT_RUNTIMES and DALVIK_VM_LIB. Bug: 18465297 Change-Id: Ibfda931cde0649163d79b584fb5ccad927a9bc2b
* | | am 8c5401c1: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"Brian Carlstrom2014-12-161-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit '8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40': Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
| * | Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATABrian Carlstrom2014-12-151-1/+0
| |/ | | | | | | | | Bug: 18673991 Change-Id: I64261ef6a37df92eeef8552b8fd0a67157e4a034
* | am 18eee18e: am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPIYing Wang2014-12-111-0/+1
|\ \ | |/ |/| | | | | * commit '18eee18e6e51da4857054376ad96add16c0c0b92': Add product variable PRODUCT_AAPT_PREBUILT_DPI
| * Add product variable PRODUCT_AAPT_PREBUILT_DPIYing Wang2014-12-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | We use search LOCAL_DPI_VARIANTS in the list of "$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)" and the first takes precedence. That way if we don't have a best match, we fall back to the second best, the way how it worked with PRODUCT_AAPT_CONFIG previously. Bug: 18388705 Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
| * Introduce per-product per-module dex-preopt configYing Wang2014-10-311-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 (cherry picked from commit 20ebd2ef081f2a3e85a4adcf8837e6f5b68bdeea) Change-Id: I2ee36892b40655c96837ee7a663dda1d25830878
* | Remove TARGET_CPU_SMP.Serban Constantinescu2014-11-241-1/+0
| | | | | | | | | | | | | | | | | | There are no more users of TARGET_CPU_SMP in the current codebase. Expert users should set "-smp" in DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES for targets that run on a single-core CPU. Change-Id: Ib94865f05a92c9a4622540cebc18ded4bdfa6363 Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
* | resolved conflicts for merge of 3907c03e to lmp-dev-plus-aospYing Wang2014-10-091-2/+17
|\ \ | |/ |/| | | Change-Id: I580ab0693609ff506da7346548a45322000114d1
| * Introduce per-product per-module dex-preopt configYing Wang2014-10-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 a WITH_DEXOPT_BOOT_IMG_ONLY configuration option.Alex Light2014-08-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | If WITH_DEXOPT_BOOT_IMG_ONLY=true and WITH_DEXPREOPT=true then we will only preopt the boot.art and boot.oat files, leaving everything else to be compiled at first boot. This has fast startup times of WITH_DEXPREOPT but has a smaller space usage and allows one to update the non-image parts of /system without reflashing. Bug: 16938924 Change-Id: Ib366b6b5ad80f7078f01bf51f9fbc29ea7e5d777
* | SDK Addon multi-sys-img support, part 4.Raphael Moll2014-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the add-on build rules to packages the system-image separately from the main add-on zip file. This is then picked up by development's sdk_repo.mk to generate two repository packages files (one for the add-on, one for its system image.) The system-image now also contains a source.propertie file, which value is not infered from the add-on's manifest.ini Add-on product files need to be modified to define a PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP variable that points to their source.properties or source.prop_template file. Change-Id: I79e9cdfd43c99f099a70890fb3e5e9215ad647f4
* | Merge "Remove services, wifi, ethernet from BOOTCLASSPATH." into lmp-devNarayan Kamath2014-08-151-0/+2
|\ \
| * | Remove services, wifi, ethernet from BOOTCLASSPATH.Narayan Kamath2014-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | They belong to the system_server classpath. bug: 16555230 Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
* | | Add a WITH_DEXOPT_BOOT_IMG_ONLY configuration option.Alex Light2014-08-111-1/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | If WITH_DEXOPT_BOOT_IMG_ONLY=true and WITH_DEXPREOPT=true then we will only preopt the boot.art and boot.oat files, leaving everything else to be compiled at first boot. This has fast startup times of WITH_DEXPREOPT but has a smaller space usage and allows one to update the non-image parts of /system without reflashing. Bug: 16938924 (cherry picked from commit 440cc769a3617bf99546bdc7599c949e1e858943) Change-Id: Ib366b6b5ad80f7078f01bf51f9fbc29ea7e5d777
* | Added support for building verified vendor partitionDaniel Rosenberg2014-07-141-2/+2
| | | | | | | | | | Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | core+tools: support specifying F2FS as the fstype for userdataJP Abgrall2014-06-171-0/+1
| | | | | | | | | | | | | | | | | | | | - Support TARGET_USERIMAGES_USE_F2FS. - Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE. - Support "userdata_fs_type" in the prop dict. - Update build_image to recognize f2fs and call the correct command. Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad Signed-off-by: JP Abgrall <jpa@google.com>
* | Added variables to support seperate vendor patition.Daniel Rosenberg2014-05-291-1/+2
| | | | | | | | | | Change-Id: I73cc76697e138aa8ce1273d410391d55c8d7f34f Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | Add verity support to `make dist`.Geremy Condra2014-05-101-1/+2
| | | | | | | | | | | | | | Without this, system images will be built that do not contain the necessary bits for verification. Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
* | am 372df5a4: am 887a52d0: am a6b8025a: Merge "Add WITH_DEXPREOPT to the list ↵Ying Wang2014-05-021-1/+2
|\ \ | | | | | | | | | | | | | | | | | | of protected global variables." * commit '372df5a49ebae4ce04df4633be195afb224c5d86': Add WITH_DEXPREOPT to the list of protected global variables.
| * \ am 887a52d0: am a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected ↵Ying Wang2014-05-021-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | global variables." * commit '887a52d02251a1a94f8e17ecbfe26ba15ece6af5': Add WITH_DEXPREOPT to the list of protected global variables.
| | * Add WITH_DEXPREOPT to the list of protected global variables.Ying Wang2014-05-011-1/+2
| | | | | | | | | | | | | | | Bug: 14380196 Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
* | | Import OEM build properties, if defined.Jeff Sharkey2014-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain products can define a list of system properties that should be delegated to the OEM. Since these properties may be ro.*, we give them first shot at defining. Also support blacklist of properties that should never be defined by build.prop, used to delegate to runtime fingerprint generation. Bug: 13367676 Change-Id: I3f00db732f485818205a7b76b31edbdc3a89aac0
* | | am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into ↵Ying Wang2014-02-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-modular-dev * commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b': Support custom sdk.atree files.
| * | Support custom sdk.atree files.Ying Wang2014-01-291-0/+1
| |/ | | | | | | | | Bug: 12683047 Change-Id: I79ca1eff81e947d03c50759d47426487e48435d0
* | resolved conflicts for merge of 1737b1ab to masterBrian Carlstrom2014-01-281-2/+2
|\ \ | |/ | | | | Change-Id: I5a5f2e83c5155c1c783711f736c60198a8f404ee
| * build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATABrian Carlstrom2014-01-281-3/+3
| | | | | | | | | | | | (cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175) Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b