Commit Graph

36531 Commits

Author SHA1 Message Date
Colin Cross
99c83f2bda Merge "Rearrange java library outputs" am: 7b7363fffb am: a4435a5025
am: 09018269a8

Change-Id: I35b5527c4142f9486c6d57498789ba2249d0a4a3
2017-04-06 15:52:26 +00: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
1ed4235172 Merge "Move proguard before classes.jar" am: 41d5cd7420 am: c40073c77f
am: 6ade789f59

Change-Id: I9ac539f18a998c3a85960526a77cfdebef9ca641
2017-04-06 02:50:55 +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
badde95384 Merge "Encode special characters in email addresses." am: c4a7ed3530 am: 1124a1bd01
am: f754ef73a5

Change-Id: I1eb192492a53263182eddce2f1ab86a015400cce
2017-04-06 00:53:15 +00: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
Dan Willemsen
d3d15935f9 Merge "Ensure that BOARD_VNDK_VERSION is current" into oc-dev
am: 8a6d7fabc3

Change-Id: I35dafe7b1f4b3d4181291277adee3cffabd15d98
2017-04-05 22:47:07 +00:00
Dan Willemsen
40837541f5 Merge "Exclude ndk stubs from notice file list" into oc-dev
am: 87bbe36728

Change-Id: I952270140dfb52d40c3a9c30d9acabcf0e7824a5
2017-04-05 22:47:00 +00:00
Dan Willemsen
7c027f4f8a Merge "Add LOCAL_EXPORT_CFLAGS for Soong" into oc-dev
am: 0192aaedad

Change-Id: I6b4e9b171443143b9bb69ef69356902e083ab462
2017-04-05 22:46:53 +00:00
TreeHugger Robot
8a6d7fabc3 Merge "Ensure that BOARD_VNDK_VERSION is current" into oc-dev 2017-04-05 22:42:18 +00:00
TreeHugger Robot
87bbe36728 Merge "Exclude ndk stubs from notice file list" into oc-dev 2017-04-05 22:42:18 +00:00
TreeHugger Robot
0192aaedad Merge "Add LOCAL_EXPORT_CFLAGS for Soong" into oc-dev 2017-04-05 22:42:18 +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
2af509ba3d Ensure that BOARD_VNDK_VERSION is current
BOARD_VNDK_VERSION controls which version of the VNDK is used for the
build. We only support compiling against the current VNDK, and we don't
support installing old prebuilt VNDK libraries yet, so ensure this
variable is set to "current".

Once we support installing old prebuilt VNDK libraries, we'll also need
to disable building modules that use the VNDK.

Test: build-aosp_arm.ninja is the same before/after
Test: Ensure there are no boards that set BOARD_VNDK_VERSION
Test: Set BOARD_VNDK_VERSION := invalid
Change-Id: Ic26c9f44e356a0734f522b4538cb866d5b901d43
(cherry picked from commit 2c3289bf37)
2017-04-05 09:59:10 -07:00
Dan Willemsen
593026b28b 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
Change-Id: Id37d4692d5fbddce467bd777903b20169f44dd6e
2017-04-05 09:49:48 -07:00
Dan Willemsen
58386bab15 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
(cherry picked from commit 2be559488d)
2017-04-05 09:47:37 -07:00
Martijn Coenen
31ee76a1e0 Merge "Add vndservicemanager to default builds." into oc-dev
am: a4f90284c7

Change-Id: I13148e6efb9f7ecb57c95000b69392d6ec69b65f
2017-04-05 15:59:06 +00:00
Martijn Coenen
a4f90284c7 Merge "Add vndservicemanager to default builds." into oc-dev 2017-04-05 15:54:45 +00:00
Nicolas Geoffray
9eef2bcf19 Make the default preopt 'interpret-only'.
am: 857d889950

Change-Id: I172f7bce93170109576d8387851294f2a42c39c8
2017-04-05 15:08:24 +00:00
Nicolas Geoffray
857d889950 Make the default preopt 'interpret-only'.
bug:33799337
bug:36534079

Test: m -j32 bullhead/angler/marlin/sailfish

Change-Id: I30d9234334dbd520194993aa0e4603e2d415c603
(cherry picked from commit e0848c8b7f)
2017-04-05 12:29:41 +00:00
Dan Willemsen
0d7c61d71b Merge "Add LOCAL_EXPORT_CFLAGS for Soong" am: a1c1e7d02f am: 1cc4bfaad5
am: 0320aea2fd  -s ours

Change-Id: I014b3f9f3aa913f2bbebe5033c3e8a6fbb249729
2017-04-05 05:50:33 +00: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
05909fae9f 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
Change-Id: Id37d4692d5fbddce467bd777903b20169f44dd6e
2017-04-05 01:04:18 +00:00
Dan Willemsen
efa8477fb4 Merge "Exclude ndk stubs from notice file list" am: b923eb60cd am: 376d29284a
am: 3ae9924032

Change-Id: Ieffc9535cafe96f2c7873bed21e86efa5e794fc4
2017-04-05 00:22:40 +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
Jin Qian
5738b9bb76 Makefile: copy mke2fs.conf to ota root
am: abcec5e0bf

Change-Id: Ia4deec66bf37bd052c811f6057828f27d8428023
2017-04-04 21:58:01 +00:00
Martijn Coenen
ca1fd78190 Add vndservicemanager to default builds.
vndservicemanager will be used for AIDL/binder
communication between processes running from
the /vendor partition. While technically only
required on full-treble devices, it is useful
to have on Android devices by default, since it
allows vendors to distribute a single binary talking
to vndservicemanager, instead of having to maintain
two versions that talk to different servicemanagers.

On devices that don't have a new kernel prebuilt with
/dev/vndbinder yet, vndservicemanager will simply
block indefinitely.

Also add new vndservice_contexts target, that
defines the service contexts for vendor services.

Bug: 36052864
Test: Marlin boots with and without /dev/vndbinder
Change-Id: I7334b5cb357dc6d4c5de8632e835dd892cd2f174
2017-04-04 14:06:04 -07:00
Jin Qian
abcec5e0bf Makefile: copy mke2fs.conf to ota root
Bug: 34947454
Change-Id: I99999c4f56df295c0bb028daf3dcc0898176c5ed
(cherry picked from commit 53524b5da9)
2017-04-04 18:19:45 +00:00
Steven Moreland
64a5de1116 Merge "ENABLE_TREBLE is deprecated" into oc-dev
am: ef8716c93a

Change-Id: I6bbfbcec37b30278c3343248e4c10f55e025d446
2017-04-04 16:38:22 +00:00
Steven Moreland
ef8716c93a Merge "ENABLE_TREBLE is deprecated" into oc-dev 2017-04-04 16:31:28 +00:00
Jaekyun Seok
40a003350d Merge "Use product-based inclusive rule for enforcing RRO" am: 4f566f3f97 am: 78a117d801
am: b723db8fdd

Change-Id: I7388d7fe148332a027b7cdf88101f5a159a9f756
2017-04-04 04:47:39 +00: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
785a6f48dd Merge "Use product-based inclusive rule for enforcing RRO" into oc-dev
am: 74e7a2dbeb

Change-Id: Id33d70c9d3d9465d3218e324d88adc4724bd394a
2017-04-04 02:34:00 +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