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
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
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
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
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
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
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
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
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
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
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
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
2017-07-20 21:18:15 +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
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
2017-07-20 21:04:14 +00:00
Adam Seaton
de8af68e73
Merge changes I7c8a25a2,Ifb32d061 into oc-dev
...
am: 683c44c812
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
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
84910a47c8
Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd
...
am: 3a88054509
2017-07-20 08:25:33 +00:00
Tobias Thierer
3a88054509
Merge "Drop obsolete javac -extdirs commandline arg."
...
am: 43440c22dd
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
Colin Cross
96018b3d10
Merge "Revert "Use java prebuilts"" am: 4d69df5191
...
am: f4e78ccf25
2017-07-19 22:55:23 +00:00
Colin Cross
f4e78ccf25
Merge "Revert "Use java prebuilts""
...
am: 4d69df5191
2017-07-19 22:52:21 +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
2017-07-19 22:49:52 +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
2017-07-19 22:47: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
2017-07-19 22:44:19 +00:00
Adam Seaton
4149340d7c
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
2017-07-19 22:44:17 +00:00
Colin Cross
4d69df5191
Merge "Revert "Use java prebuilts""
2017-07-19 22:44:12 +00:00
Colin Cross
02112900cc
Revert "Use java prebuilts"
...
This reverts commit 1931750940
2017-07-19 22:42:46 +00:00
Adam Seaton
6ac9ecd397
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
2017-07-19 22:41:18 +00:00
Adam Seaton
a94af85a7d
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
2017-07-19 22:41:17 +00:00
Adam Seaton
c7040501a1
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
2017-07-19 22:38:20 +00:00
Adam Seaton
df338dadee
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
2017-07-19 22:38:17 +00:00
Adam Seaton
dbecffb85f
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
2017-07-19 22:35:20 +00:00
Adam Seaton
50efec7a2c
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
2017-07-19 22:35:17 +00:00
Adam Seaton
29c817a61c
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
2017-07-19 22:32:48 +00:00
Adam Seaton
8f46ad2ded
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
2017-07-19 22:29:49 +00:00
Adam Seaton
aec34cff65
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
2017-07-19 22:26:18 +00:00
Adam Seaton
f01d7163e8
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
2017-07-19 22:23:47 +00:00
Adam Seaton
2f9c66b727
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours am: bac9a62680 -s ours
...
am: b4682b1f42
2017-07-19 22:23:46 +00:00
Adam Seaton
35f0f8df33
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
2017-07-19 22:20:47 +00:00
Adam Seaton
b4682b1f42
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours
...
am: bac9a62680
2017-07-19 22:20:45 +00:00
Adam Seaton
d3789031c9
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
2017-07-19 22:18:21 +00:00
Adam Seaton
bac9a62680
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours
...
am: 690b7e9091
2017-07-19 22:18:15 +00:00
Android Build Merger (Role)
7b38914e4e
Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp
2017-07-19 22:16:37 +00:00
Colin Cross
7d7f4cd7bb
Merge "Use java prebuilts" am: 26e1b6d6c2
...
am: fcbaa25380
2017-07-19 22:16:07 +00:00
Adam Seaton
bb3979b057
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d am: 1500ea69de -s ours
...
am: 25d1a95575
2017-07-19 22:15:47 +00:00
