Adam Seaton
9a0ddb1332
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14
...
am: 859eeaa4ad
2017-04-12 22:58:08 +00:00
Adam Seaton
557f15a715
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0
...
am: 49ca7ee1b0
2017-04-12 22:57:50 +00:00
Adam Seaton
0e503efe43
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0
...
am: 49ca7ee1b0
2017-04-12 22:57:50 +00:00
Adam Seaton
888cf4cf67
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283
...
am: c347cb4986
2017-04-12 22:57:45 +00:00
Adam Seaton
5958603884
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283
...
am: c347cb4986
2017-04-12 22:57:44 +00:00
Adam Seaton
c37c1a540d
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa
...
am: e966226f39
2017-04-12 22:52:43 +00:00
Adam Seaton
859eeaa4ad
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373
...
am: 597a5a8b14
2017-04-12 22:52:36 +00:00
Adam Seaton
49ca7ee1b0
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
...
am: 15420e5bb0
2017-04-12 22:52:19 +00:00
Adam Seaton
c347cb4986
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
...
am: 518f3b9283
2017-04-12 22:52:14 +00:00
Adam Seaton
9e63540d01
Merge changes Iee17fa80,Id9ee50be into lmp-dev
...
* changes:
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
[DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev
2017-04-12 22:50:45 +00:00
Adam Seaton
ea6878b926
Merge changes I5c252cba,I80259eef into mnc-dev
...
* changes:
[DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
[DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev
2017-04-12 22:49:42 +00:00
Adam Seaton
e966226f39
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours
...
am: 47d4a317fa
2017-04-12 22:47:47 +00:00
Adam Seaton
597a5a8b14
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours
...
am: 3720a2f373
2017-04-12 22:47:40 +00:00
Adam Seaton
15420e5bb0
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
...
am: 70d708e29f
2017-04-12 22:47:17 +00:00
Adam Seaton
518f3b9283
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
...
am: d9a5e99599
2017-04-12 22:47:13 +00:00
Adam Seaton
47d4a317fa
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0
...
am: c4d46c791a
2017-04-12 22:42:20 +00:00
Adam Seaton
3720a2f373
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c
...
am: a73f9cf1f5
2017-04-12 22:42:15 +00:00
Adam Seaton
c4d46c791a
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303
...
am: d1174126d0
2017-04-12 22:36:51 +00:00
Adam Seaton
a73f9cf1f5
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb
...
am: a34845a20c
2017-04-12 22:36:43 +00:00
Adam Seaton
d1174126d0
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e
...
am: 47e5cb0303
2017-04-12 22:31:19 +00:00
Adam Seaton
a34845a20c
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3
...
am: 14ef6098bb
2017-04-12 22:31:13 +00:00
Adam Seaton
47e5cb0303
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours
...
am: 9a805d9e3e
2017-04-12 22:26:47 +00:00
Adam Seaton
14ef6098bb
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours
...
am: 988fc368d3
2017-04-12 22:26:42 +00:00
Adam Seaton
9a805d9e3e
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722
...
am: fa8973ba33
2017-04-12 22:21:17 +00:00
Adam Seaton
988fc368d3
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e
...
am: 18c3da68f0
2017-04-12 22:21:12 +00:00
Adam Seaton
fa8973ba33
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours
...
am: 2d19cbf722
2017-04-12 22:16:46 +00:00
Adam Seaton
18c3da68f0
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours
...
am: 65101a958e
2017-04-12 22:16:42 +00:00
Adam Seaton
2d19cbf722
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours
...
am: 2d14a7da35
2017-04-12 22:11:46 +00:00
Adam Seaton
65101a958e
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours
...
am: 4389a11f4b
2017-04-12 22:11:42 +00:00
Adam Seaton
2d14a7da35
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404
...
am: 89ebb51f6b
2017-04-12 22:05:45 +00:00
Adam Seaton
4389a11f4b
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07
...
am: 386d7ae2e8
2017-04-12 22:05:41 +00:00
Adam Seaton
89ebb51f6b
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3
...
am: 35e82a6404
2017-04-12 22:00:12 +00:00
Adam Seaton
386d7ae2e8
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
...
am: 8dcfa2ac07
2017-04-12 22:00:09 +00:00
Adam Seaton
35e82a6404
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
...
am: c686e139b3
2017-04-12 21:55:12 +00:00
Adam Seaton
8dcfa2ac07
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
...
am: e6a77de43b
2017-04-12 21:55:10 +00:00
Adam Seaton
70d708e29f
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
...
bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16
2017-04-12 21:26:52 +00:00
Adam Seaton
80f445482c
[DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
...
bug:37204197
Change-Id: I5c252cba4fc0ad0d605218a71da91843256c4c64
2017-04-12 21:24:54 +00:00
Adam Seaton
91a21e9d12
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
...
bug:37204197
Change-Id: Iee17fa80c5c29b439bcbe85f11526a8b89247fdf
2017-04-12 21:22:54 +00:00
Martijn Coenen
bcd029c587
Add hwservice_contexts to default builds.
...
Bug: 34454312
Test: marlin boots
Change-Id: Ifff8c2842b4131dba6a480c87c6db1e65497e6ef
2017-04-12 12:43:26 -07:00
Jaekyun Seok
0d16dd1942
Remove resource overlay
...
Test: building succeeded and tested with sailfish vendor image.
Bug: 36231603
Change-Id: I5d2d6d882ef3fc8a807a8b0ecd2f59f8a4a03e1f
2017-04-12 18:35:19 +09:00
TreeHugger Robot
720ed98a0d
Merge "Support split /system and /vendor modules from Soong" into oc-dev
2017-04-12 02:39:52 +00:00
Dan Willemsen
58760e47aa
Support split /system and /vendor modules from Soong
...
Soong modules may be split into both /system and /vendor variants.
Ensure that Make libraries link against the correct version based on
whether LOCAL_USE_VNDK is set.
Bug: 36426473
Bug: 36079834
Test: build-aosp_arm64.ninja files are the same before/after
Test: attempt building with BOARD_VNDK_VERSION:=current
(cherry picked from commit 9d2b3280e8
2017-04-11 13:17:48 -07:00
Adam Seaton
d9a5e99599
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
...
bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9
2017-04-11 18:20:36 +00:00
Adam Seaton
060a4a1c76
[DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev
...
bug:37204197
Change-Id: I80259eef1e7a0d0761d3bb31082b7b3606cef669
2017-04-11 18:18:48 +00:00
Adam Seaton
380441000d
[DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev
...
bug:37204197
Change-Id: Id9ee50bec46f2fd3f9e2e5f546c062f946bff36f
2017-04-11 18:17:34 +00:00
Colin Cross
487a313bb6
Fix duplicate and dangling rules
...
I6730e2d3ec38004874265b2a690442dec57b33f4 introduced duplicate rules
to build classes.jar for static java library prebuilts, and left rules
to copy $(built_dex_intermediates) to $(built_dex) for modules that
don't build dex files.
Move prebuilts LOCAL_BUILT_MODULE back to javalib.jar to match
non-prebuilt modules, and remove the manual building of javalib.jar.
Add a check around $(built_dex_intermediates) for static java libraries.
Bug: 36901093
Bug: 36902714
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I291510b56162f0d35553e3c7ccd59b1382224d62
(cherry picked from commit 96476c1d50
2017-04-11 10:02:04 -07:00
Colin Cross
69d85288cb
Rearrange java library outputs
...
Jack can silently handle using a java library as a static java
library by merging in the java library dex file. This causes
problems when switching to javac, because dex doesn't support
dex merging with multidex enabled?
Make the output files consistent between java libraries and static
java libraries. Java libraries will now produce:
classes-pre-proguard.jar: the classes before proguard processing
classes.jar: the final jar file containing classes before dexing
javalib.jar: a jar containing classes.dex
Static java libraries will eventually only produce
classes-pre-proguard.jar and classes.jar. All inter-library
linking is done with classes.jar, so a java library can be
used as a static java library.
There are too many dependencies outside the build system that
expect javalib.jar to exist for static and host java libraries,
so for now continue to build a javalib.jar that is a copy of
classes.jar.
Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Test: m -j java
Bug: 36901093
Bug: 36902714
Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
(cherry picked from commit 941b682099
2017-04-11 10:01:28 -07:00
Colin Cross
ffbf0a66d8
Move proguard before classes.jar
...
Downstream users of a library always link against javalib.jar, which
is either the dex jar for java libraries or a copy of
proguard.classes.jar for static java libraries. In preparation for
making java libraries a superset of static java libraries, make
classes.jar always be the final class-containing jar for use
downstream, and always create a classes-pre-proguard.jar for
users that need a jar without shrinking or obfuscation.
Also rename the intermediates to be consitent: classes-<tool>.jar
Bug: 36902714
Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Change-Id: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92
(cherry picked from commit 6fabefa88e
2017-04-11 17:00:02 +00:00
Adam Seaton
c686e139b3
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
...
Bug:37204197
Change-Id: I797a8c6332a3bf62ba6ba9b17de9754e7cf5a902
2017-04-10 09:38:38 -07:00
Adam Seaton
e6a77de43b
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
...
Bug:37204197
Change-Id: I7b0b5428c9b1f7ea7ab3a3e272689e6324dde8af
2017-04-10 09:36:42 -07:00
