p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,788 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

38788 Commits

Author SHA1 Message Date
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
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 de8af68e73 Merge changes I7c8a25a2,Ifb32d061 into oc-dev 
am: 683c44c812

Change-Id: Icfaf43620d6adb89d263711d3026c7c91ad08a1c
 2017-07-20 20:57:46 +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
Tobias Thierer 75ebdd6e7d droiddoc: Fix trailing ':' in -classpath, -sourcepath values 
full_java_lib_deps has trailing whitespace if $(LOCAL_CLASSPATH)
is empty. Because the calculation of PRIVATE_CLASSPATH was
missing a $(strip ...), this resulted in an (unintentional)
trailing ':' in the values of the -classpath and -sourcepath
arguments to the javadoc tool, which that tool is documented
to interpret as '.' (the working directory).

This CL converts the expression to a call to normalize-path-list,
from definitions.mk, which contains the $(strip ...):

define normalize-path-list
$(subst $(space),:,$(strip $(1)))
endef

After this CL, an empty $(LOCAL_CLASSPATH) no longer gets
misinterpreted as the current working directory.

This issue was minor (it made no difference in practice).

Test: Treehugger
Bug: 62049770

Change-Id: Ia0e3e5657d0fa057fe998515f34bc7b8df5f6f16
 2017-07-20 19:46:18 +01:00
Colin Cross e97e69359a Use java prebuilts 
Point the make java variables at JDK prebuilts in
prebuilts/jdk/jdk8, add them to the path, and clean up
some old overrides.

Reapplies Ibbeb30fab96e45aedd5bb6d710d1170f85789982 after updating
some more manifests to include the prebuilts.

Bug: 62956999
Test: m -j checkbuild
Change-Id: I9e27aa5cb04d1ed09e43b798e5d654843afc000f
(cherry picked from commit 1931750940)
 2017-07-20 15:14:26 +00:00
Tobias Thierer 2b4f281142 Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd am: 3a88054509 
am: 84910a47c8

Change-Id: I2d72f81e784cfd64de925611357c4ea643ed6ac8
 2017-07-20 08:29:04 +00:00
Tobias Thierer 84910a47c8 Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd 
am: 3a88054509

Change-Id: Ie0d592b4d97f46e8d369c63c9a9e82bfeacb419d
 2017-07-20 08:25:33 +00:00
Tobias Thierer 3a88054509 Merge "Drop obsolete javac -extdirs commandline arg." 
am: 43440c22dd

Change-Id: I7d5736b6b5760341aca1a8810f13d999733bc68a
 2017-07-20 08:22:03 +00:00
Tobias Thierer 43440c22dd Merge "Drop obsolete javac -extdirs commandline arg." 2017-07-20 08:17:34 +00:00
Jiyong Park 5ae0097f6f Apks are again allowed to use vendor libs as before 
When BOARD_VNDK_VERSION is set, native libs that were labeled as
native:platform are now divided into native:platform and native:vendor
sets depending on their install locations. In order to keep the existing
apks to use all the libraries that they have been using, native:vendor
is also added to the allowed types for apks.

However, in the future when we have vendor SDK and enforce all vendor
apks to use the vendor SDK, we will disallow native:vendor to
app:platform and native:vendor will be allowed only to those vendor apks
(probably labeled as app:vendor).

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m <a vendor lib using vendor jni>
(e.g. ModemDiagnosticSystem in internal master)

Change-Id: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b
 2017-07-20 13:48:56 +09: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
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 bf774777e7 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

Change-Id: I7b822b8a3fe4c3fd1f0221ad54c331e69b621c97
 2017-07-19 22:49:52 +00:00
Adam Seaton feb090c1b8 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

Change-Id: I76868c7ef97d25b99c713b4f95122d43e94f15ba
 2017-07-19 22:49:52 +00:00
Android Build Merger (Role) 12704f3e27 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 2017-07-19 22:47:33 +00:00
Adam Seaton 3b49e3e16b 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: 265901b17b

Change-Id: I37cd17f5984160b7bdd59ba8748706afc41816b6
 2017-07-19 22:47:20 +00:00
Adam Seaton e6b2cb887f 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

Change-Id: Id894f66ec72805495a41cb8e9a0a1266c95826e3
 2017-07-19 22:47:20 +00:00
Adam Seaton b81e890ef9 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

Change-Id: Iae950b38f0d5ae4870019e4586f42ce81dc33714
 2017-07-19 22:47:19 +00:00
Adam Seaton 265901b17b 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

Change-Id: I5ab3cfb12bb66ec0d67233714aab4bf6001fe0ba
 2017-07-19 22:44:19 +00:00
Adam Seaton 05eed82d81 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

Change-Id: Ifa3d8036c7b8a8c3165043875e806774713b3039
 2017-07-19 22:44:19 +00:00