summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_build into ↵Wolfgang Wiedmeyer2016-03-189-53/+99
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | replicant-6.0 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
| * | | qcom: Explicitly build the custom audio policy for legacy alsaArne Coucheron2016-03-171-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ib0efba23e20ff156c032fe0ad428c5fa08b15f8d
| * | | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-112-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/build into cm-13.0 Android 6.0.1 release 22 Change-Id: Icd3603c1efc5fa85f48c19d13d484f0371ddae37
| | * | "MHC19J"The Android Automerger2016-02-091-1/+1
| | | |
| | * | "MHC19I"The Android Automerger2016-02-051-1/+1
| | | |
| | * | "MHC19H"The Android Automerger2016-02-021-1/+1
| | | |
| | * | "MHC19G"The Android Automerger2016-02-011-1/+1
| | | |
| | * | "MHC19F"The Android Automerger2016-01-281-1/+1
| | | |
| | * | "MHC19E"The Android Automerger2016-01-271-1/+1
| | | |
| | * | "MHC19D"The Android Automerger2016-01-221-1/+1
| | | |
| | * | "MHC19C"The Android Automerger2016-01-211-1/+1
| | | |
| | * | "MHC19B"The Android Automerger2016-01-201-1/+1
| | | |
| | * | "MHC19"The Android Automerger2016-01-191-1/+1
| | | |
| | * | Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e ↵Zach Jang2016-01-121-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 * commit '6c61548bb7e426704760c9351e3211fb45d67dae': Updating security patch string to 2016-03-01
| | | * \ Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e ↵Zach Jang2016-01-121-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 53e7d9bf7f am: c9da4cce57 * commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc': Updating security patch string to 2016-03-01
| | | | * \ Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43eZach Jang2016-01-121-1/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 53e7d9bf7f * commit '53e7d9bf7f298c438157dccc5222b7484b083d9e': Updating security patch string to 2016-03-01
| | | | | * \ Updating security patch string to 2016-03-01 am: c24c6ccd4dZach Jang2016-01-121-1/+1
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 293887c43e * commit '293887c43ee5b797f8628f5983f64bf766002009': Updating security patch string to 2016-03-01
| | | | | | * \ Updating security patch string to 2016-03-01Zach Jang2016-01-121-1/+1
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c24c6ccd4d * commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad': Updating security patch string to 2016-03-01
| | | | | | | * | Updating security patch string to 2016-03-01Zach Jang2016-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/26499556 Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
| | | | | * | | | DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2bZach Jang2015-12-091-1/+1
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: af970fb308 * commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617': DO NOT MERGE - Update security string to 2016-02-01
| | | | | | * | | DO NOT MERGE - Update security string to 2016-02-01Zach Jang2015-12-091-1/+1
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 929a4abd2b * commit '929a4abd2b777715bc730593aee87643a30706d6': DO NOT MERGE - Update security string to 2016-02-01
| | | | | | | * | DO NOT MERGE - Update security string to 2016-02-01Zach Jang2015-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/26110717 Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
| | | | | * | | | Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5adZach Jang2015-11-211-1/+1
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 645f200ae8 * commit '645f200ae8708414d06618989328dc3e3c84a917': Update Security String to 2016-01-01 - DO NOT MERGE
| | | | | | * | | Update Security String to 2016-01-01 - DO NOT MERGEZach Jang2015-11-211-1/+1
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 58cdbdc5ad * commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07': Update Security String to 2016-01-01 - DO NOT MERGE
| | | | | | | * | Update Security String to 2016-01-01 - DO NOT MERGEZach Jang2015-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/25819582 Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
| | | | | * | | | Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8Zach Jang2015-10-261-1/+1
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cc9ac27157 * commit 'cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d': Update security string to 2015-12-01 - DO NOT MERGE
| | | | | | * | | Update security string to 2015-12-01 - DO NOT MERGEZach Jang2015-10-261-1/+1
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6575d4a2a8 * commit '6575d4a2a8c78a703e5c2e2889ecb358668d1bbd': Update security string to 2015-12-01 - DO NOT MERGE
| | | | | | | * | Update security string to 2015-12-01 - DO NOT MERGEZach Jang2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
| | | | | * | | | resolved conflicts for b161297d to lmp-mr1-ub-devZach Jang2015-09-212-0/+19
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
| | | | | | * | | am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 ↵Zach Jang2015-09-212-0/+19
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Security Patch Level in Settings CL#2/3 * commit 'ab095b445af361911df2856e77f43c4cf103a0e2': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
| | | | | | | * | am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security ↵Zach Jang2015-09-212-0/+19
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch Level in Settings CL#2/3 * commit '48e2b43e8cc030456b0f625f321c45d2e1775130': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
| | | | | | | | * \ am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in ↵Zach Jang2015-09-172-0/+19
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings CL#2/3 * commit '47ef4c3467e4f895b776fb0e8dbcba8f90a9398c': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
| | | | | | | | | * | DO NOT MERGE - Backport of ag/748221 - Security Patch Level in SettingsZach Jang2015-09-172-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL#2/3 b/23946860 Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
| | | | | | * | | | | am 8d771971: Don\'t fail build of otatools if there are no device certificatesClaes Elgemark2015-08-261-1/+1
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d771971212069f77851163f437c782f581bf6db': Don't fail build of otatools if there are no device certificates
| | | | | | | * | | | Don't fail build of otatools if there are no device certificatesClaes Elgemark2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23552169 Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
| | * | | | | | | | | Update Security String to 2016-02-01 am: f0f73c06e2Zach Jang2015-12-091-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5e2b003a11 * commit '5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76': Update Security String to 2016-02-01
| | | * | | | | | | | Update Security String to 2016-02-01Zach Jang2015-12-091-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f0f73c06e2 * commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57': Update Security String to 2016-02-01
| | | | * | | | | | | Update Security String to 2016-02-01Zach Jang2015-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/26110717 Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
| | * | | | | | | | | Update Security String to 2016-01-01 to mnc-dev am: 170459f438Zach Jang2015-11-211-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bcf2866fb1 * commit 'bcf2866fb1ea50ea31ede70f62b864332f61b980': Update Security String to 2016-01-01 to mnc-dev
| | | * | | | | | | | Update Security String to 2016-01-01 to mnc-devZach Jang2015-11-211-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 170459f438 * commit '170459f4385d35dd991549e1b545c376ca8df281': Update Security String to 2016-01-01 to mnc-dev
| | | | * | | | | | | Update Security String to 2016-01-01 to mnc-devZach Jang2015-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/25819582 Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
| | | | * | | | | | | Update security string to 2015-12-01Zach Jang2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
| | * | | | | | | | | Revert "Change version back to 6.0"Bart Sears2015-11-151-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55a149b740 * commit '55a149b74064b799efe9c69211a511725cb9925b': Revert "Change version back to 6.0"
| | | * | | | | | | | Revert "Change version back to 6.0"Bart Sears2015-11-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 970f203b3d3f17b778749c3ce47eb6b922aa606c. Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
| | * | | | | | | | | Change version back to 6.0Bart Sears2015-11-151-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 970f203b3d * commit '970f203b3d3f17b778749c3ce47eb6b922aa606c': Change version back to 6.0
| | | * | | | | | | | Change version back to 6.0Bart Sears2015-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily set the version back to 6.0 and security patch to 2015-11-01. Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
| | * | | | | | | | | Switch emulator to generate userdebug images by defaultVince Harron2015-11-111-1/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is primarily to avoid using the unsupported JIT on Android-M It will increase app install times significantly because the app will be compiled at install time. OTOH, It should improve application performance dramatically. Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543 (cherry picked from commit 08787d747d71d7ff3f13d2275d937faefc6d7777)
| * | | | | | | | | Fix a race condition while building the recovery patchMartin Blumenstingl2016-03-081-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RECOVERY_PATCH_INSTALL has a dependency on RECOVERY_FROM_BOOT_PATCH. This is correct, because RECOVERY_PATCH_INSTALL uses make_recovery_patch which needs the imgdiff tool. imgdiff on the other hand is a dependency of RECOVERY_FROM_BOOT_PATCH. This should ensure that all dependencies are met. However, RECOVERY_FROM_BOOT_PATCH is defined after RECOVERY_PATCH_INSTALL, making the dependency effectively non-existant. Moving RECOVERY_FROM_BOOT_PATCH before RECOVERY_PATCH_INSTALL fixes a race-condition where sometimes imgdiff was not build before RECOVERY_PATCH_INSTALL is called. Upstream is not affected by this bug, since it does not contain RECOVERY_PATCH_INSTALL anymore. The following error can be observed whenever someone hits this race condition (which is basically always reproducible when building with -j1): Installing recovery patch to system partition Warning: could not find SYSTEM/build.prop in <built-in function zip> using prebuilt recovery.img from BOOTABLE_IMAGES... using prebuilt boot.img from BOOTABLE_IMAGES... Traceback (most recent call last): File "./build/tools/releasetools/make_recovery_patch", line 55, in <module> main(sys.argv[1:]) File "./build/tools/releasetools/make_recovery_patch", line 51, in main common.MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img) File "build/tools/releasetools/common.py", line 1461, in MakeRecoveryPatch _, _, patch = d.ComputePatch() File "build/tools/releasetools/common.py", line 1146, in ComputePatch p = Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) File "build/tools/releasetools/common.py", line 100, in Run return subprocess.Popen(args, **kwargs) File "/usr/lib/python2.7/subprocess.py", line 710, in __init__ errread, errwrite) File "/usr/lib/python2.7/subprocess.py", line 1335, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory build/core/Makefile:1047: recipe for target 'out/target/product/t00n/system/bin/install-recovery.sh' failed Fixes: 3d1c612e5c82 ("Revert "Revert "core: Makefile: Build install-recovery into the system image""") Change-Id: I28e8c845ffc830553ca5177cbe22ae72b185b437
| * | | | | | | | | Merge tag 'android-6.0.1_r17' into HEADJessica Wagantall2016-03-072-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 release 17 Ticket: CYNGNOS-1854
| | * | | | | | | | "MMB29V"The Android Automerger2016-01-221-1/+1
| | | | | | | | | |
generated by cgit v1.1 at 2024-12-23 13:32:08 +0000