tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38784 commits 1 branch 0 tags 119 MiB
Commit graph

38784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ian Pedowitz
22c06e7c8e oc-mr1-dev is OC-MR1, don't allow building beyond it 
Bug: 63544673
Test: Can't lunch marlin-userdebug-PPR1
$ lunch marlin-userdebug-PPR1
build/core/version_defaults.mk:55: Invalid TARGET_PLATFORM_VERSION 'PPR1', must be one of
build/core/version_defaults.mk:56: *** OPM1.  Stop.

Change-Id: I116b0cebb353600277876eabccf41e7dda736151
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
 2017-07-28 11:12:19 -07:00
Lucas Dupin
203de1108f Merge "Removed overlay from target" into oc-dr1-dev 
am: eb42aa7438

Change-Id: If2720dcb6e3c376f968e454fb734f3443c5a3080
 2017-07-25 23:23:03 +00:00
TreeHugger Robot
eb42aa7438 Merge "Removed overlay from target" into oc-dr1-dev 2017-07-25 17:40:03 +00:00
Ian Pedowitz
0f61372f57 DO NOT MERGE Setting build_id to OC-MR1 for oc-mr1-dev 
Bug: 63544673
Test: lunching a target shows 'BUILD_ID=OC-MR1'
Change-Id: I0cb3cf6fa27a92a173e40945ad701ccf29bd4d0e
 2017-07-24 19:20:32 -07:00
Lucas Dupin
3297613a43 Removed overlay from target 
Lock screen colors won't be handled by overlays anymore.

Test: make
Bug: 63751714
Change-Id: I496575d62ab326e7bb774643fac6fcb8d6c801a1
 2017-07-24 13:29:26 -07:00
Hung-ying Tyan
76c0e76413 Merge "Fix potential build break" into oc-dev am: 7740a78495 -s ours 
am: 1a614a0856  -s ours

Change-Id: If4474aed7998bf4f4570ebdcc8c0eb6f00e97b4b
 2017-07-24 17:12:38 +00:00
Hung-ying Tyan
1a614a0856 Merge "Fix potential build break" into oc-dev 
am: 7740a78495  -s ours

Change-Id: Iee24871f486b8ef21e6992a101e97734377c6613
 2017-07-24 17:07:37 +00:00
TreeHugger Robot
7740a78495 Merge "Fix potential build break" into oc-dev 2017-07-24 16:50:08 +00:00
Jorim Jaggi
2145739ff4 Merge "Revert "Removed overlay from target"" into oc-dr1-dev 
am: 8a7f2128b3

Change-Id: If4242cbe667e689662ba2323e986d35cf6c03f53
 2017-07-24 14:13:41 +00:00
Jorim Jaggi
8a7f2128b3 Merge "Revert "Removed overlay from target"" into oc-dr1-dev 2017-07-24 14:07:55 +00:00
Jorim Jaggi
fa794173fe Revert "Removed overlay from target" 
This reverts commit fd2b1807ca.

Fixes crashloop with lock pattern

Change-Id: I6f15c18e7a10d6755ab151bb976616e753e520a3
Fixes: 63980375
 2017-07-24 13:55:19 +00:00
Lucas Dupin
33d42fbb0e Merge "Removed overlay from target" into oc-dr1-dev 
am: 67afad200d

Change-Id: I4d01fdbffe8dd0c61c8adb9dd4c855b99dbf8ca3
 2017-07-22 04:51:03 +00:00
TreeHugger Robot
67afad200d Merge "Removed overlay from target" into oc-dr1-dev 2017-07-22 04:46:20 +00:00
Tao Bao
7a0a560c15 Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev 
am: 9c77abd6f2

Change-Id: Id96d37fd4e4ca639d3ed15e8472f1f2b2953e1ff
 2017-07-21 17:18:00 +00:00
Tao Bao
9c77abd6f2 Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev 2017-07-21 17:11:40 +00:00
Tao Bao
1dc5d47653 Look for non-existent files listed in avb_vbmeta_args. 
In BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS, if we have defined
"--include_descriptors_from_image" with an image file whose path points
to source tree, add_img_to_target_files.py or sign_target_files_apks.py
may fail to find the file. Because these scripts may run without a
source tree, by taking target_files.zip as the only input.

This CL scans additional locations in the input target_files.zip to find
those missing files in avb_vbmeta_args. As long as the files are included
in the target_files.zip, they get a second chance to be found.

Bug: 63910867
Test: As follows:
 1. Setup BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS with a local file path;
 2. Remove the local file;
 3. sign_target_files_apks.py fails without this CL;
 4. sign_target_files_apks.py works.
Change-Id: I3c58f80a5535db02b74cfe40d0c0beff72587cf8
 2017-07-21 01:20:14 -07:00
Pawin Vongmasa
c194d53411 Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev 
am: 8fc04cc40a

Change-Id: I841a7739d2ec7de3945b04dce1609d071287f8dc
 2017-07-20 23:11:35 +00:00
TreeHugger Robot
8fc04cc40a Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev 2017-07-20 23:06:38 +00:00
Adam Seaton
56c43fefd9 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours am: ff70113263 
am: 302f80a992

Change-Id: I6054b5e9bd43ab6f65b829201c2e755cb106ac8a
 2017-07-20 21:42:47 +00:00
Adam Seaton
302f80a992 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours 
am: ff70113263

Change-Id: I11021275894122faa1db94e927fd6f801eb8acda
 2017-07-20 21:40:17 +00:00
Adam Seaton
2e5d8a9b01 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours am: 54b51dc69a 
am: 09b926c699

Change-Id: Ic7b05cd05e835b26ee3a0807b42a6bfeb8d17a94
 2017-07-20 21:38:18 +00:00
Adam Seaton
ff70113263 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours 
am: 5c7aef3747  -s ours

Change-Id: Iea1f7cca1c2973b7c761d08ef86d4b601576dd67
 2017-07-20 21:38:16 +00:00
Adam Seaton
5c7aef3747 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours 
am: 1215b2f770  -s ours

Change-Id: Id1e28c7a431fa76634aa7ea8010721c3578d75e5
 2017-07-20 21:36:19 +00:00
Adam Seaton
09b926c699 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82 -s ours 
am: 54b51dc69a

Change-Id: Ib0d67b51629889909ef645e4181dd4b4159f4ebd
 2017-07-20 21:36:16 +00:00
Adam Seaton
54b51dc69a Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 
am: 9f13a87b82  -s ours

Change-Id: I909711741b28cb8e2f2df8339276f3d79fec1e06
 2017-07-20 21:34:15 +00:00
Adam Seaton
1215b2f770 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours 
am: a65c03517e  -s ours

Change-Id: I5ed187e174d8acfe59076da5af02b1135b1a9955
 2017-07-20 21:34:15 +00:00
Adam Seaton
9f13a87b82 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 
am: 19ebbf50a4

Change-Id: I87ae76f73665edf2ba7004aaacb5f7cf27b8b108
 2017-07-20 21:32:17 +00:00
Adam Seaton
a65c03517e Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours 
am: a562f661ca  -s ours

Change-Id: I7d9efb4dcd6f0adfff83cf21df4d4e76cd422526
 2017-07-20 21:32:15 +00:00
Adam Seaton
19ebbf50a4 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d 
am: 25eee603c8

Change-Id: If92333e458ee2f7a31141e1fb72c867ec60c800f
 2017-07-20 21:29:46 +00:00
Adam Seaton
a562f661ca Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d 
am: 25eee603c8  -s ours

Change-Id: I1e180a225282a3bffe9c47334122f7580b2026a5
 2017-07-20 21:29:45 +00:00
Adam Seaton
25eee603c8 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 
am: 0d1b7e183d

Change-Id: Ifc5eec2c2b43745f0d7bc61a670bc5c4b4cbdece
 2017-07-20 21:27:45 +00:00
Adam Seaton
0d1b7e183d Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours 
am: 15d200c399

Change-Id: I67a568b3e4c55df2fd57dc5af4ac32f3f037bbc9
 2017-07-20 21:25:46 +00:00
Adam Seaton
15d200c399 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 
am: 2d28e0372a  -s ours

Change-Id: Ib8dfc0f08e2086b0161d9c7ad122103a95e1a709
 2017-07-20 21:18:15 +00:00
Adam Seaton
a8772230d1 Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812 
am: c7d9294cd9

Change-Id: Iea69629779d87a7a6ae74216076f1093f13931b0
 2017-07-20 21:10:44 +00:00
Adam Seaton
2d28e0372a Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 
am: cfbb865e29

Change-Id: Idb5c1e9cc98cf9e235eaf4de07a94c26eec3455a
 2017-07-20 21:10:44 +00:00
Adam Seaton
cfbb865e29 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 
am: 60d6fe7552

Change-Id: I22072a5a682601a1561f78284d99d2d3953d5dff
 2017-07-20 21:04:14 +00:00
Adam Seaton
c7d9294cd9 Merge changes I7c8a25a2,Ifb32d061 into oc-dev 
am: 683c44c812

Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
 2017-07-20 20:57:46 +00:00
Adam Seaton
60d6fe7552 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev 
am: 65b4d916e6

Change-Id: Ib983d0c46cbe3de3a57da7ec1b128dbe8eeb5627
 2017-07-20 20:57:44 +00:00
Adam Seaton
683c44c812 Merge changes I7c8a25a2,Ifb32d061 into oc-dev 
* changes:
  Updating Security String to 2017-09-05 Bug:63846344
  Updating Security String to 2017-09-01 Bug:63846344
 2017-07-20 20:45:01 +00:00
Adam Seaton
65b4d916e6 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev 2017-07-20 20:44:51 +00:00
Colin Cross
443529098c Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp 
am: 00f21a2360

Change-Id: Ib1186289e955e0b6f35285a192b2e02d8996f4ee
 2017-07-19 23:08:25 +00:00
Adam Seaton
d57ce81269 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9 am: bf774777e7 
am: bc9262f23a

Change-Id: I6fa939d7e71eb18b9bce9d9ef2c52f7338695536
 2017-07-19 23:07:46 +00:00
Android Build Merger (Role)
00f21a2360 Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp 2017-07-19 22:58:49 +00:00
Colin Cross
f2da657628 Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 
am: 96018b3d10

Change-Id: Ib54b8c0fbb95179bff97abe028d133da3528380f
 2017-07-19 22:58:23 +00:00
Adam Seaton
bc9262f23a Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9 
am: bf774777e7

Change-Id: I0f583e320e81234d39d00d1423e1817bfd1893e4
 2017-07-19 22:58:22 +00:00
Colin Cross
96018b3d10 Merge "Revert "Use java prebuilts"" am: 4d69df5191 
am: f4e78ccf25

Change-Id: I1b0bfaa059f68e09c115662ca9f850213305b8f0
 2017-07-19 22:55:23 +00:00
Adam Seaton
6e6617d31e Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9 am: feb090c1b8 
am: 19141646d1

Change-Id: I5e426da58552d7a9079ddbe170dd69442dbc2789
 2017-07-19 22:55:21 +00:00
Colin Cross
f4e78ccf25 Merge "Revert "Use java prebuilts"" 
am: 4d69df5191

Change-Id: I978bf3d25e0be2a2a6b40c5b396821cc2a8d9365
 2017-07-19 22:52:21 +00:00
Adam Seaton
19141646d1 Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours am: 4149340d7c -s ours am: b81e890ef9 
am: feb090c1b8

Change-Id: I836b797c63fdbb4bbc8033fb968b63663e91fc31
 2017-07-19 22:52:20 +00:00
Adam Seaton
f6c882c76b Merge "Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae -s ours am: c0d2cfb8b8 am: 214aeaefef -s ours am: 451a9d73bf am: d3789031c9 am: 35f0f8df33 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f am: c7040501a1 -s ours am: 6ac9ecd397 am: 05eed82d81" into oc-dr1-dev-plus-aosp 
am: 12704f3e27

Change-Id: Icbf6231abc5cc1299aee317092e269e8c240a185
 2017-07-19 22:51:03 +00:00