openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
38,612 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

38612 Commits

Author SHA1 Message Date
Lucas Dupin 10bf90f60f Merge "Removed overlay from target" into oc-dr1-dev 
am: 67afad200d

Change-Id: If5a32cc9bfa3d8116b9a69403fd7484eedf5dfe8
 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
Colin Cross 31d4e4da36 Merge "Disable desugaring try-with-resources" am: 28794da1c0 am: e99de69665 
am: d11b4bdd21

Change-Id: Id59faa10e53f41829760cbba76b08968c45132b3
 2017-07-21 20:58:18 +00:00
Tao Bao a768450dd7 Merge "Look for non-existent files listed in avb_vbmeta_args." am: 5180c3b97b am: d91be38c5e 
am: ccce786735

Change-Id: I9a8881872b9c2a4df6cf0420f807e0d345ec4556
 2017-07-21 20:57:52 +00:00
Colin Cross d11b4bdd21 Merge "Disable desugaring try-with-resources" am: 28794da1c0 
am: e99de69665

Change-Id: I77037408e96141f500b40bb0cee7aab7305d35dd
 2017-07-21 20:55:11 +00:00
Tao Bao ccce786735 Merge "Look for non-existent files listed in avb_vbmeta_args." am: 5180c3b97b 
am: d91be38c5e

Change-Id: Ib9f1508aeb75da3682f2f50341b2ac12a6926a13
 2017-07-21 20:54:51 +00:00
Colin Cross e99de69665 Merge "Disable desugaring try-with-resources" 
am: 28794da1c0

Change-Id: I5a6d131e689922586482d950e933e5ea86e7729e
 2017-07-21 20:52:54 +00:00
Tao Bao d91be38c5e Merge "Look for non-existent files listed in avb_vbmeta_args." 
am: 5180c3b97b

Change-Id: I6a035f46f09f70f11c271693158392f98927aa0f
 2017-07-21 20:52:24 +00:00
Colin Cross 28794da1c0 Merge "Disable desugaring try-with-resources" 2017-07-21 20:48:45 +00:00
Treehugger Robot 5180c3b97b Merge "Look for non-existent files listed in avb_vbmeta_args." 2017-07-21 20:47:01 +00:00
Ivan Lozano 5ed442013a Merge "Fix exclusion overriding local integer_overflow." am: b549e826dd am: a458ab05f5 
am: 041ed5a784

Change-Id: I9471d54f68bb53e3cc639ea41684dcfc23bdd167
 2017-07-21 20:28:31 +00:00
Ivan Lozano 041ed5a784 Merge "Fix exclusion overriding local integer_overflow." am: b549e826dd 
am: a458ab05f5

Change-Id: Ib136b4fc2cabc7dd5bfd10442028b0e01d34dc22
 2017-07-21 20:25:16 +00:00
Ivan Lozano a458ab05f5 Merge "Fix exclusion overriding local integer_overflow." 
am: b549e826dd

Change-Id: I42dd978a5393d903be7fda66d64a4e39387e0b17
 2017-07-21 20:20:47 +00:00
Ivan Lozano b549e826dd Merge "Fix exclusion overriding local integer_overflow." 2017-07-21 20:15:01 +00:00
Tao Bao 9a5f419ecf 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
(cherry picked from commit 1dc5d47653)
 2017-07-21 11:57:00 -07:00
Ivan Lozano b4749cb0fc Fix exclusion overriding local integer_overflow. 
INTEGER_OVERFLOW_EXCLUDE_PATHS should only apply to the global sanitizer
setting, and should not override local module settings. This pulls out
the check so it occurs earlier and does not interfere with local
settings. This makes Make consistent with Soong's behavior as well.

Bug: 30969751
Test: Created a test build file with this explicitly set, excluded the
path, and checked if it was still being sanitized.

Change-Id: I9020d92bae136b6087d37f71d5337acaefe850b4
 2017-07-21 10:53:13 -07:00
Tao Bao f691e0a869 Merge "Look for non-existent files listed in avb_vbmeta_args." into oc-dr1-dev 
am: 9c77abd6f2

Change-Id: I86b3d6fa39a08014d97397322349dc1c389346d5
 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
Tobias Thierer 3ca6866bb3 Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values" am: 40594041f4 am: cdcb785c3d 
am: f485958696

Change-Id: I9b37395d0403e780060ef107d21156919378f957
 2017-07-21 09:53:05 +00:00
Tobias Thierer f485958696 Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values" am: 40594041f4 
am: cdcb785c3d

Change-Id: Ife7768f97b70bf799526d8d89bd397fa18dbda71
 2017-07-21 09:51:04 +00:00
Tobias Thierer cdcb785c3d Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values" 
am: 40594041f4

Change-Id: I5bd49c9a5e199f797781dbb14f3bd1bc2915c1ad
 2017-07-21 09:48:36 +00:00
Tobias Thierer 40594041f4 Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values" 2017-07-21 09:43:30 +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 5309a4758e Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev 
am: 8fc04cc40a

Change-Id: I083c28df9d9ba1b1ce656222bc3d4196cdc8ae2e
 2017-07-20 23:11:43 +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
Colin Cross bf4ac7a82f Disable desugaring try-with-resources 
Desugaring try-with-resources is not necessary for platform builds,
and triggers some problems for apps built as part of the platform
that target SDK versions before 19.  Disable all try-with-resource
desugaring.

Bug: 63180735
Bug: 63900665
Bug: 63901645
Test: m -j ANDROID_COMPILE_WITH_JACK=false checkbuild
Change-Id: I98b827aa1e80b43e6eb7b58254c23c7a4f7dc52d
 2017-07-20 15:07:22 -07:00
Android Build Merger (Role) e935be4c11 Merge "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" into oc-dr1-dev-plus-aosp 2017-07-20 21:43:02 +00:00
Adam Seaton 0fbc9f7c34 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: 801a62fe07

Change-Id: I5365615d90a2a1b0f088566f3f2dc147ac91a29d
 2017-07-20 21:42:47 +00:00
Adam Seaton 42374da7e0 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: I6ce81e513a48c2d44f9c13856c53a298e598e6c1
 2017-07-20 21:42:47 +00:00
Adam Seaton 801a62fe07 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: I426d73701f503112b4672c1f21b016c9ec91d898
 2017-07-20 21:40:17 +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
Android Build Merger (Role) ed0fd97e22 Merge "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" into oc-dr1-dev-plus-aosp 2017-07-20 21:38:32 +00:00
Adam Seaton 58ddaa911a 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: I1422aec5fecf3a1d1dd8d9f4de9952978a08fbe1
 2017-07-20 21:38:18 +00:00
Adam Seaton 2e66fbc652 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: 02e95f72ed

Change-Id: Iff04d4d8d46b0b4b276d3e10c784ef6906f6ef16
 2017-07-20 21:38:17 +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 02e95f72ed 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: I0f17739403d07c5452a9bc5efd2256f10e5fbc04
 2017-07-20 21:36:16 +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 6f6fb6964e Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812 
am: c7d9294cd9

Change-Id: I134e3526ef8c0445bb7b163a66fed81fce0802cf
 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 41020cce0f Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812 
am: de8af68e73

Change-Id: I66f8a11ddf19aca734841498fa71fab40699eb70
 2017-07-20 21:04:14 +00:00