Commit Graph

34466 Commits

Author SHA1 Message Date
Colin Cross
348d20bcce Merge "Fix duplicate and dangling rules" am: f9f8b21af3
am: 50d2ffdfe3

Change-Id: I20b39bbaf3ba642b10f4364beb4b580d2a5a7ac1
2017-04-06 20:03:30 +00:00
Colin Cross
50d2ffdfe3 Merge "Fix duplicate and dangling rules"
am: f9f8b21af3

Change-Id: I7da59735bf22dbf54cdadfb45e01e21693e4054b
2017-04-06 20:00:31 +00:00
Treehugger Robot
f9f8b21af3 Merge "Fix duplicate and dangling rules" 2017-04-06 19:49:45 +00:00
Colin Cross
96476c1d50 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
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I291510b56162f0d35553e3c7ccd59b1382224d62
2017-04-06 10:23:04 -07:00
Colin Cross
09018269a8 Merge "Rearrange java library outputs" am: 7b7363fffb
am: a4435a5025

Change-Id: I9185bea7f0233cf2007714ef5f787281972889d7
2017-04-06 15:45:24 +00:00
Colin Cross
a4435a5025 Merge "Rearrange java library outputs"
am: 7b7363fffb

Change-Id: Ia0f975785542973a052cd0b24ee9c1b756babfe6
2017-04-06 15:37:52 +00:00
Colin Cross
7b7363fffb Merge "Rearrange java library outputs" 2017-04-06 15:30:45 +00:00
Colin Cross
6ade789f59 Merge "Move proguard before classes.jar" am: 41d5cd7420
am: c40073c77f

Change-Id: Ib60ca56f292d105bbd873422915d9640463610df
2017-04-06 02:47:23 +00:00
Colin Cross
c40073c77f Merge "Move proguard before classes.jar"
am: 41d5cd7420

Change-Id: I65fe576155f9375d4f05f598b62032af1d3e6695
2017-04-06 02:44:23 +00:00
Treehugger Robot
41d5cd7420 Merge "Move proguard before classes.jar" 2017-04-06 02:39:13 +00:00
Colin Cross
941b682099 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
Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
2017-04-05 18:04:37 -07:00
Chih-hung Hsieh
f754ef73a5 Merge "Encode special characters in email addresses." am: c4a7ed3530
am: 1124a1bd01

Change-Id: I2745911481dde3317b85e31ec6e2f2758e9b0740
2017-04-06 00:49:44 +00:00
Chih-hung Hsieh
1124a1bd01 Merge "Encode special characters in email addresses."
am: c4a7ed3530

Change-Id: I5b22ee5588388433c82333993bd2ebb25dbd9d52
2017-04-06 00:46:45 +00:00
Colin Cross
950f1efbbc 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

Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Change-Id: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92
Merged-In: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92
(cherry picked from commit 6fabefa88e)
2017-04-06 00:46:23 +00:00
Chih-hung Hsieh
c4a7ed3530 Merge "Encode special characters in email addresses." 2017-04-06 00:40:51 +00:00
Chih-Hung Hsieh
bee0dec6c4 Encode special characters in email addresses.
Now accept email addresses with '+' character.

Bug: 33166666
Test: checkowners.py -v -c `find . -name OWNERS`
Change-Id: I7792551e6be74e942906a75344233439d4bfeca3
2017-04-05 14:16:49 -07:00
Dan Willemsen
0320aea2fd Merge "Add LOCAL_EXPORT_CFLAGS for Soong" am: a1c1e7d02f
am: 1cc4bfaad5

Change-Id: I13abbdc51cb28f94364449cdb34ea2cb80cbc503
2017-04-05 05:48:03 +00:00
Dan Willemsen
1cc4bfaad5 Merge "Add LOCAL_EXPORT_CFLAGS for Soong"
am: a1c1e7d02f

Change-Id: I0b52a889346ca29c7679bbb29b1e89f08b7efc4d
2017-04-05 05:46:05 +00:00
Dan Willemsen
a1c1e7d02f Merge "Add LOCAL_EXPORT_CFLAGS for Soong" 2017-04-05 05:43:05 +00:00
Dan Willemsen
2a8a39398b Add LOCAL_EXPORT_CFLAGS for Soong
This lets Soong pass -isystem or -I as necessary (or potentially, even
other cflags in the future).

This is not available for Android.mk use, nor exposed directly to
Android.bp users.

Test: m -j
Merged-In: Id37d4692d5fbddce467bd777903b20169f44dd6e
Change-Id: Id37d4692d5fbddce467bd777903b20169f44dd6e
2017-04-05 03:36:00 +00:00
Dan Willemsen
3ae9924032 Merge "Exclude ndk stubs from notice file list" am: b923eb60cd
am: 376d29284a

Change-Id: I748095028e09742a61ecada07e25d918f9d4fd10
2017-04-05 00:15:39 +00:00
Dan Willemsen
376d29284a Merge "Exclude ndk stubs from notice file list"
am: b923eb60cd

Change-Id: I2243e2dd534b602d983a8233d1499e7063d10a05
2017-04-05 00:13:39 +00:00
Treehugger Robot
b923eb60cd Merge "Exclude ndk stubs from notice file list" 2017-04-05 00:09:01 +00:00
Dan Willemsen
2be559488d Exclude ndk stubs from notice file list
There are many references to ndk stub libraries in the third party
notices:

out/soong/ndk/platforms/android-10/arch-arm/usr/lib/libc.so
out/soong/ndk/platforms/android-10/arch-arm/usr/lib/liblog.so
...

These are just stub libraries, and aren't distributed on the device. The
real versions of these libraries will be distributed on the device, and
already have the license information.

So let Soong set LOCAL_NO_NOTICE_FILE to prevent these from appearing.

Bug: 36867708
Test: Diff aosp_arm's system/etc/NOTICE.html.gz file before/after
Change-Id: Ifa3693bde7d3b6b9dc7a83122f9cfa24997fac50
2017-04-04 14:59:55 -07:00
Jaekyun Seok
b723db8fdd Merge "Use product-based inclusive rule for enforcing RRO" am: 4f566f3f97
am: 78a117d801

Change-Id: If81f9136cd10deb9a7bdd9d623639eff6dfd8a8c
2017-04-04 04:44:08 +00:00
Jaekyun Seok
78a117d801 Merge "Use product-based inclusive rule for enforcing RRO"
am: 4f566f3f97

Change-Id: Iaa5ec37c9d6d0e9c2dfe9573b61465e127d60f8d
2017-04-04 04:40:08 +00:00
Treehugger Robot
4f566f3f97 Merge "Use product-based inclusive rule for enforcing RRO" 2017-04-04 04:34:36 +00:00
Jaekyun Seok
1b2242895e Use product-based inclusive rule for enforcing RRO
Board-based rule can cause unexpected regression because build-time overlays
are different among products. So each product should be tested with its own
product-based rule considering its build-time overlays before applying
enforcing RRO.

Additionally RRO conversion is mandatory only for overlays of which target is
included in AOSP system image and is critical for CTS/VTS tests with AOSP
system image. So inclusive rule is more suitable instead of exclusive rule
to avoid unexpected regression due to unnecessary RRO conversion.

Note that we still support conversion for all the overlays by specifying
PRODUCT_ENFORCE_RRO_TARGETS as "*".

Test: building succeeded and tested with auto-generated RROs.
Bug: 36231603
Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
(cherry picked from commit 2a209997e8)
2017-04-04 11:31:24 +09:00
Alex Deymo
b83d6d50ab Merge "Don't include the dev-key on IOT products." am: 41febee0cc
am: b20d1d7a74

Change-Id: Id31abf9343870de33248269fe23b3c6c75ee7431
2017-04-04 00:53:08 +00:00
Alex Deymo
b20d1d7a74 Merge "Don't include the dev-key on IOT products."
am: 41febee0cc

Change-Id: I1825d82eac9b046c76d35bbb93bae31f86fd2be5
2017-04-04 00:49:40 +00:00
Treehugger Robot
41febee0cc Merge "Don't include the dev-key on IOT products." 2017-04-04 00:43:35 +00:00
Alex Deymo
cec578c916 Don't include the dev-key on IOT products.
This patch updates the logic to use the PRODUCT_IOT variable instead of
BRILLO.

Bug: 36702887
Test: `make`; Image doesn't have the dev key.
Change-Id: I1751e97d8cdfeba83c7e4720a017a5f4dcfd49da
2017-04-03 15:04:35 -07:00
Elliott Hughes
ced2e48998 Merge "fsconfig: Use defined macro for masking" am: 35eaf52ee2
am: d83bb4193a

Change-Id: Ie5fb625707a7e59bd623130617515674c908f0a6
2017-04-03 21:31:40 +00:00
Elliott Hughes
d83bb4193a Merge "fsconfig: Use defined macro for masking"
am: 35eaf52ee2

Change-Id: I291e16fba756e661dcd56722b957ce68bc055c9b
2017-04-03 21:28:10 +00:00
Elliott Hughes
35eaf52ee2 Merge "fsconfig: Use defined macro for masking" 2017-04-03 21:21:55 +00:00
Elliott Hughes
7206a3b38c Merge "Switch to a shell_and_utilities phony module." am: cdcc4c52aa
am: b7b29357ae

Change-Id: I08efbab350cb47bfb63c706c49130b70461a205c
2017-04-03 17:22:58 +00:00
Elliott Hughes
b7b29357ae Merge "Switch to a shell_and_utilities phony module."
am: cdcc4c52aa

Change-Id: Idb8a4ce418a64ac8691df9d1890d60f32102c1cc
2017-04-03 17:19:35 +00:00
Elliott Hughes
cdcc4c52aa Merge "Switch to a shell_and_utilities phony module." 2017-04-03 17:15:17 +00:00
Elliott Hughes
c86ea11fe9 Switch to a shell_and_utilities phony module.
(cherrypick of cb7d59687483c9532beecde60fe96053eda76948.)

Bug: N/A
Test: builds
Change-Id: I6416d9dded4cc225f57f0a521cf6114f39203ece
2017-04-03 17:13:58 +00:00
doheon1.lee
5cd3bcab86 fsconfig: Use defined macro for masking
Mask opeation with CAP_ prefixed name can be wrapped with
CAP_MASK_LONG macro.

Change-Id: Ide31ad62fac0d28e7a02e45059fe6d2461da7e27
2017-04-03 15:17:06 +09:00
Dan Albert
fd349adff6 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong." am: 194e73dd15
am: b8989bd1b1

Change-Id: I4ee4da01952f114057985550f82fd5488dbf0675
2017-03-31 23:19:42 +00:00
Dan Albert
b8989bd1b1 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong."
am: 194e73dd15

Change-Id: Ib1d690c07010622593405519b125077adfebace0
2017-03-31 23:17:12 +00:00
Dan Albert
6861a292a0 Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a
am: e2b92d809f

Change-Id: I9cb0b52b1121146aa75ffff31e63ae5118ad9510
2017-03-31 23:12:11 +00:00
Dan Albert
e2b92d809f Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES."
am: 979dac690a

Change-Id: Ib4aa98fe335d90f1407ccb27fa4c57d5d30cbbf5
2017-03-31 23:09:42 +00:00
Treehugger Robot
194e73dd15 Merge "Expose PLATFORM_VERSION_ALL_CODENAMES to soong." 2017-03-31 23:09:26 +00:00
Treehugger Robot
979dac690a Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." 2017-03-31 23:03:20 +00:00
Dan Albert
a3afbb9562 Expose PLATFORM_VERSION_ALL_CODENAMES to soong.
Test: make checkbuild
Bug: None
Change-Id: I9c8d8ff38b617ac352b951214d428f9c9af0f79d
2017-03-31 13:13:21 -07:00
Andreas Gampe
df187b1ba7 Merge "Build: Force system owner for ASAN in system" am: 542c3d57d0
am: dd8293b2e7

Change-Id: I0ba058a16939b902d6f235524d26a21372568adf
2017-03-31 19:56:58 +00:00
Andreas Gampe
dd8293b2e7 Merge "Build: Force system owner for ASAN in system"
am: 542c3d57d0

Change-Id: Ice7cfce4a62c636a1c97f9f4406a127564a7e552
2017-03-31 19:54:29 +00:00
Andreas Gampe
542c3d57d0 Merge "Build: Force system owner for ASAN in system" 2017-03-31 19:46:27 +00:00