summaryrefslogtreecommitdiffstats
path: root/core/Makefile
Commit message (Collapse)AuthorAgeFilesLines
...
* | | More custom mkbootimg cleanupMichael Bestas2015-10-251-3/+3
| | | | | | | | | | | | | | | | | | | | | * Prevent duplicate 'Made recovery image:' message when using custom mkbootimg Change-Id: I178321bcb5661e07833b1b56b5c9e2cf20e421d7
* | | build: Fix check on BOARD_CUSTOM_BOOTIMG_MKGabriele M2015-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current code, '!' is added as prefix to the string contained in $(BOARD_CUSTOM_BOOTIMG_MK). This means that !$(BOARD_CUSTOM_BOOTIMG_MK) is never an empty string and therefore the condition is always true. The if function has a third optional argument that is evalueted when the condition is false, so use it to fix the current code. Change-Id: If1e459f6c40f655b47a12b77761921c943964e3b
* | | Revert "Revert "core: Makefile: Build install-recovery into the system image""dhacker292015-10-171-2/+73
| | | | | | | | | | | | | | | | | | This reverts commit 468ddd95411ca8616d2a11038161e5f776c36d53. Change-Id: I09e65907ad0f6374b55deaca1fa380b304fb10f6
* | | build: Actually build the recovery.img if !BOARD_CUSTOM_BOOTIMG_MKdhacker292015-10-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix the BOARD_CUSTOM_BOOTIMG_MK if and call build of recovery.img also removed unused variable RECOVERYIMAGE_EXTRA_DEPS until associated commit is merged Change-Id: I94f5f26bc01e03d761ccc260342f330a4a06b141
* | | Revert "core: Makefile: Build install-recovery into the system image"Steve Kondik2015-10-161-73/+2
| | | | | | | | | | | | | | | | | | This reverts commit cd021f75199f7e3096bbf0dadfe07d580eda1b24. Change-Id: I7f5292f451331a30c48873b7c45a94400d706aa8
* | | build: Fix BOARD_CUSTOM_BOOTIMG_MK for recovery target.Adnan Begovic2015-10-161-20/+14
| | | | | | | | | | | | Change-Id: I3daf0b6288421c3880c8b3a71c15bafb87ae3df3
* | | build: Cleanup and fix merge derpRashed Abdel-Tawab2015-10-121-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix VBOOT/VERITY desparity introduced in https://github.com/CyanogenMod/android_build/commit/409f818fccdee9147812b2cb06e703808f55a57a * Add some colors lost in rebase * Fix endif comments Change-Id: Ida979250d3cfeca0c534083c76c08b5d13f08689
* | | Merge branch 'LA.BF64.1.2.2_rb4.1' of git://codeaurora.org/platform/build ↵Steve Kondik2015-10-121-5/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | into caf-merge Change-Id: I45b40ac1055e35b89cce1c256bb6939dfd3b610d
| * | | build: releasetools: ota: Add support for 32-64 bit upgradesAmeya Thakur2015-10-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use the new API to determine if the update package is compatible with the device it is currently being applied on or not. We also use the 32 bit updater libraries while compiling the ota package. Change-Id: I65ce3527087853463e28ad3b067c02c9b3d3f9c9
| * | | Makefile: Add dependencies for recovery_patch_installAmeya Thakur2015-10-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the recovery_patch_install rule is the last one that is run during the system image creation process. This will ensure the contents of system/ are finalized when the rule is run. Change-Id: I941678aad678504ae6def208134ceed21b5a8a86
| * | | core: Makefile: Build install-recovery into the system imageAmeya Thakur2015-10-061-2/+65
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now generate and install install-recovery.sh and recovery- from-boot.p as a part of the normal make. This is needed in order for incremental ota updates to work. Without this change the targetfiles.zip which is used as the source for the incremental package contains the two files from above but the system image generated by the same build does not.This causes the update to fail when we try to apply it Change-Id: Ibe79eb8f19e89a775f72a330bea1ed5552109f4f
* | | Fix case where boot/recovery.img were being built with wrong params.Ameya Thakur2015-10-121-0/+18
| | | | | | | | | | | | | | | | | | | | | The boot and recovery images now get built using the same params during ota package generation as during a normal build. Change-Id: I93d46e11a4245288f0e87c87a2e4bf45ac5aff69
* | | Force bsdiff for recovery_from_boot.p if not using GZIPAndreas Blaesius2015-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | imgdiff expects a ramdisk to use GZIP, which is causing a chunk size issue if recovery is using LZMA Change-Id: I3194b4faed25a298fe23b4e24b6dea2885bafda8
* | | build: Allow packaging of factory image files into target filesBrint E. Kriebel2015-10-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Files may be required inthe target files package for factory flashing processes. Allow these to be added using PRODUCT_FACTORYIMAGE_FILES. Change-Id: I74b42daee7b73f762f3c75904c6c278b1e5f5c53 Ticket: RM-112
* | | misc_info: Add factory script location to misc_info when availableBrint E. Kriebel2015-10-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a factory script is specified for the device, store the location of the script in the misc_info package for proper use during package signing. Change-Id: Icd3ab59ebb68b8b6c92aff8eaf9e44322cdcbc18 Ticket: RM-112
* | | Allow setting the recovery density separately from the aapt configChirayu Desai2015-10-091-0/+4
| | | | | | | | | | | | Change-Id: I817a4c01302956ec846503d9a585c43e690e45bf
* | | build: Add the factorypackage targetDiogo Ferreira2015-10-091-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build system generates several artifacts, among them update zips, OTAs and update packages for fastboot. Shipping devices typically need extra-special packages in order to fulfill factory automation requirements. This patches adds a "factorypackage" target that can be customized by devices by providing a script that converts target files into the desired format. The script path should be set into TARGET_RELEASETOOL_FACTORY_FROM_TARGET_SCRIPT. Change-Id: I993f12766c96274f096c5f6c6da5aaa32394abbc
* | | build: avoid recovery patch if device setup can't do it correctlyHashcode2015-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of Amazon OMAP4's there is a 2nd-bootloader which is inserted at a fixed location in both boot.img and recovery.img. If this 2nd-bootloader is not present, it puts the device in a non-booting state requiring the user to recover the device using fastboot tools. Also, due to the extra binary information in the image, imgdiff hangs during build. For devices like this, allow bypass of the recovery patch generatation. NOTE: In previous versions of CM the BOARD_CUSTOM_BOOTIMG_MK flag accomplished this, but was never forward ported to cm-12.0 and on. Use a new board flag here for clarity as most custom bootimg makefiles can still process a patch for recovery. https://github.com/CyanogenMod/android_build/blob/cm-11.0/core/Makefile#L935 Change-Id: I9284ee227358224e3add9862db5c1fbd0f5bd226
* | | Generate extra userdata partition if neededEthan Chen2015-10-091-0/+2
| | | | | | | | | | | | | | | | | | | | | * To support variants of devices which may come in 16/32/64GB variants. Change-Id: I74c32d8316f0450a1445fe95a95e5cabb7a9dd1b (cherry picked from commit aae837f9cbcff739cb660016a6d1abd7ef4663db)
* | | Fix syntax issues and recovery generationStephen Bird2015-10-081-6/+6
| | | | | | | | | | | | Change-Id: I2394ffb16fa06421c5f0cc5f5ee77db72d3399ba
* | | core: Add recovery image targetBrandon McAnsh2015-10-071-0/+12
| | | | | | | | | | | | | | | Change-Id: I436ff8e91e9549fd4b61a2bd2796df9e5b1031dd Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
* | | build: Make sure we're targeting as 32bit for sqlite3.Adnan Begovic2015-10-071-1/+1
| | | | | | | | | | | | Change-Id: I31f737969bbd193974aaf06182efcb3d71735064
* | | build: Readd backwhack and sqlite3.Adnan Begovic2015-10-071-1/+2
| | | | | | | | | | | | Change-Id: I1557389d5ce23bab84fd6471122359592b1f1a28
* | | build: remove extreneous backwhackDan Pasanen2015-10-071-1/+1
| | | | | | | | | | | | Change-Id: Iac7b8d16008dcf4ad1e8d425340df032f8405746
* | | build: Fix extreneous endif.Adnan Begovic2015-10-071-2/+0
| | | | | | | | | | | | | | | | | | | | | Bad merge of d22599be55f8a229ea47cd9329da4e3b23245078 introduced compile issues. Change-Id: Ibeefc4904ae52938612819347852d7c4c5a0e82d
* | | build: Update install tools packaging for target-files supportBrint E. Kriebel2015-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies "build: ota: Support for install tools in /tmp/install" to support signing steps being split from build steps. Package install files into target-files INSTALL path Read from target-files for OTA package creation Change-Id: I64f919c2a757b5474f6cc5f82bd6c33c2a8b558a
* | | Revert "Revert "build: Handle custom boot images properly""Brint E. Kriebel2015-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is still needed, per this discussion here: http://review.cyanogenmod.org/#/c/76919/ This reverts commit 78d216bc157021e111a31a6606622cef4b9d383d. Change-Id: If494c2c6468185bc0e10cdb92847a9f8429b79c4
* | | Revert "build: Handle custom boot images properly"Brint E. Kriebel2015-10-061-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to force this since we need to be able to re-sign boot images with proper keys, which requires rebuilding of the images. This also has an error in it from merging (dropped _MK). This reverts commit 22913dea82299eac7e1a5e754102b89af4796a0d. Change-Id: Id1353e9883c3f24bbc10e685f43bede779430025
* | | add unpackbootimg to otatoolsKoushik Dutta2015-10-061-0/+1
| | | | | | | | | | | | Change-Id: I4e294c05eacc8bef8273247bcf1bf382291a3d31
* | | build: releasetools: ota: Add support for 32-64 bit upgradesAmeya Thakur2015-10-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | We now use the new API to determine if the update package is compatible with the device it is currently being applied on or not. We also use the 32 bit updater libraries while compiling the ota package Change-Id: I4d1d2bd90e03e6f4b2f786d25c6d02f62243c3f3
* | | build: fix darwin compileRoman Birg2015-10-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | BSD cp command is different from GNU cp command. GNU ignores the slashes at the end, while the slash alters the behavior of the BSD version. Change-Id: I8e2e8d98df6819d9c3451b0d96e3269131a4fb4e Signed-off-by: Roman Birg <roman@cyngn.com>
* | | build: Add an option to block non-enforcing buildsRicardo Cerqueira2015-10-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent accidental build of test configurations. Hopping back and forth between states (especially disabled) leaves a mess in the filesystems, and we want to try to ensure published builds go out enforcing. Change-Id: I2206975968de421dec842f49b02490fa85ca9f3b
* | | build: Add changes to release tools and mkbootimgAmeya Thakur2015-10-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change the prototype of LoadRecoveryFstab to take in the device type as a argument. Fix the case where mkbootimg was being passed a incorrect argument. Change-Id: Ic6ac596d8d96d3a5effbdf513763ec1cb92b1a03
* | | releasetools: allow devices to specify a custom make_recovery_patchDan Pasanen2015-10-061-0/+5
| | | | | | | | | | | | Change-Id: I891660c1bf919b369afd4ff496fb6bab85dffe3f
* | | Fix ro.build.product not found by ota_from_target_files in some casesdhacker292015-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | After I5dccba2172dade3dacc55d832a2042fce306b5f5 it was possible that if override_prop was set and override_device was not set the script was looking for a prop that did not exist. Change-Id: I444a33de5bcb59f129bdcf631c2a6540c5926545
* | | build: Use project pathmap for recoveryTom Marshall2015-10-061-4/+4
| | | | | | | | | | | | Change-Id: I6339ac77b899a43db21261d587252b65cb58ad79
* | | build: Handle custom boot images properlyBrint E. Kriebel2015-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a pre-built image should be used, it should be stored in the target files zip so that it can be used with external signing processes. Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0 Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
* | | ota: Build uboot bootable images when necessaryRicardo Cerqueira2015-10-061-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/Makefile tools/releasetools/common.py Change-Id: I18996bb1f5377bbf369fb41774aaa1f5821e7d1f
* | | Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICEdhacker292015-10-061-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies buildinfo.sh to not set model, name, description, and fingerprint in build.prop. These can then be set via custom init lib. This also fixes ota_from_target_files to function without these props being preset. Change-Id: I945b2c38e60b207d2d0f82b34f4f230ac21b0657
* | | build: recovery: Support adding device-specific itemsTom Marshall2015-10-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | (cdesai): Also add the relevant parts from koush's commit 7fd5a89df5ec3961c9aedfd2afad50d6d2561056 "Add initial support for charge mode. also support recovery/root in the device tree to easily copy props into recovery images." Change-Id: I25205e68282680932917016646dabd1abadbfce6
* | | Remove deprecated custom squisher codeMichael Bestas2015-10-061-3/+0
| | | | | | | | | | | | | | | | | | * No devices should be using that anymore Change-Id: I752cf5297d35a842a923a8008fbec53e8fae97e0
* | | recovery: build uncompressed ramdiskKoushik Dutta2015-10-061-0/+6
| | | | | | | | | | | | | | | Change-Id: I6027868864ec2696f20705faf4c68c684e7ef459 Signed-off-by: Chirayu Desai <chirayudesai1@gmail.com>
* | | Redo BOARD_CUSTOM_BOOTIMG_MK supportRicardo Cerqueira2015-10-061-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | Simplified version of the previous implementation. Recovery's ramdisk is spun off from the main recovery target again to allow overriding just the image-generation step Change-Id: Ie49620e5e438222d2b80efeefcde4d136e346b90
* | | build: Store the jenkins build number in misc_infoBrint E. Kriebel2015-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | | If the jenkins build number is available, list it as build_number in the misc_info.txt file. Change-Id: I6500c6b53661f2904dff738d25d8a8d24a7dca80
* | | build: Add new public keys to recoveryBrint E. Kriebel2015-10-061-0/+5
| | | | | | | | | | | | Change-Id: I11dea464297813be36e60c23728dde8893535c46
* | | Store the base64 release key in the OTA zipsRicardo Cerqueira2015-10-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This can be directly grepped in pre-existing package.xml tables to make sure we're not trying to update to a differently signed build Change-Id: I7528a8e7c484ea9209cd665b9263328ae834586a
* | | Store the value from TARGET_OTA_ASSERT_DEVICE to a fileBrint E. Kriebel2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | This is needed so it can be read in when re-signing a package to allow for the proper device asserts. Change-Id: I8f3bb491bbbaa4d2b827a45ef83f12c6c83e6712
* | | Allow individual projects to enforce a property's valueRicardo Cerqueira2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some projects require system properties to be set to a specific value (for example, a shared library needing a property pointing to its own path) in order to work correctly, but some device configurations are mistakenly setting those properties with the wrong value (usually inherited from the original OEM build). "PRODUCT_PROPERTY_UBER_OVERRIDES += property=value" can (and should) be used in that project's makefile to ensure the value is the correct one. This variable is intended for software projects, and should never be used in product makefiles (BoardConfig, cm.mk, AndroidProduct) Change-Id: I1986e7c444e51cce8b198e43fdc793fad16d6276
* | | For user builds, use a release build id in the description if one existsRicardo Cerqueira2015-10-061-2/+6
| | | | | | | | | | | | | | | | | | Companion change to Ic5913e587400dd38c04aa05de3a7becced77a59e Change-Id: If5edbf56d567701f96f0ba46af9a90ffa8310c24
* | | build: Add support for vendor product and device nameSteve Kondik2015-10-061-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CM's build system assumes some convention-over-configuration which we might need to override in order to conform to vendor requirements. * Allow overriding of target and product names using these new variables. This allows for CM conventions to work, while generating the correct fingerprint dynamically without post processing the strings. Change-Id: Ic5913e587400dd38c04aa05de3a7becced77a59e
generated by cgit v1.1 at 2025-09-16 19:49:15 +0000