Commit Graph

37167 Commits

Author SHA1 Message Date
Jiyong Park
930a918d01 Embedding the JNI lib is controlled by PRODUCT_FULL_TREBLE
Test: unzip -l vendor/app/ims/ims.apk shows libimscamera_jni.so and
libimsmedia_jni.so

Merged-In: I1e02ec2e0af52e9e128528a20abb90746cc83828
Change-Id: I1e02ec2e0af52e9e128528a20abb90746cc83828
(cherry picked from commit a6b038ff4c)
2017-05-17 23:20:26 +09:00
Jiyong Park
c59d93d771 Merge "Embed jni libs in vendor apks for treble-ized devices" into oc-dev
am: f99f37b243  -s ours

Change-Id: I49ecd0cde24f927c9cadd2ef2e5486c6edbe5e91
2017-05-17 10:45:09 +00:00
Jiyong Park
a66e9fa375 Embed jni libs in vendor apks for treble-ized devices
am: e1a3b367fe  -s ours

Change-Id: I9796f546c650db7739b0ffa427823e7258addcc3
2017-05-17 10:40:45 +00:00
TreeHugger Robot
f99f37b243 Merge "Embed jni libs in vendor apks for treble-ized devices" into oc-dev 2017-05-17 09:41:59 +00:00
Tao Bao
bec856bc46 Merge "Makefile: Remove the duplicate lines for OTATOOLS." into nyc-mr2-dev-plus-aosp
am: 443d5fdf24

Change-Id: I335bead53e07b5c1b7a54bd7f38dffb8c971db79
2017-05-17 00:55:28 +00:00
Tao Bao
443d5fdf24 Merge "Makefile: Remove the duplicate lines for OTATOOLS." into nyc-mr2-dev-plus-aosp 2017-05-17 00:39:18 +00:00
Dan Willemsen
3f1a35b8bd Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" am: 34b3a41217 am: 39eaf668d2
am: 32df519a06  -s ours

Change-Id: I2319525beb1291bf9391b211f9779cc407b92fc4
2017-05-17 00:09:59 +00:00
Dan Willemsen
32df519a06 Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" am: 34b3a41217
am: 39eaf668d2

Change-Id: I5f9aeab46d8789c465edb44f9f2d03c391cdb69c
2017-05-17 00:07:57 +00:00
Dan Willemsen
39eaf668d2 Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH"
am: 34b3a41217

Change-Id: I56c9044adf5fbfcc672ec69b4f071f5b5822be8f
2017-05-17 00:06:03 +00:00
Treehugger Robot
34b3a41217 Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" 2017-05-16 23:59:25 +00:00
Jiyong Park
e1a3b367fe Embed jni libs in vendor apks for treble-ized devices
JNI libs used by bundled APKs have been installed outside of the APK
(e.g. /system/lib and /vendor/lib) to save space because multiple APKs
may share the same set of JNI libs.

However, this causes problem for treble-ized devices where access to
/vendor/lib is prohibited for system processes including Java apps.

So, the JNI libs are embedded into the APK when the APK is installed to
/vendor partition and the device is fully treble-ized.

Bug: 37491282
Test: Move an APK and its JNI libraries to vendor partition by setting
LOCAL_PROPRIETARY_MODULE := true and build:
The jni lib does not exist under /system or /vendor. unzipping
the apk reveals the jni lib under ./lib/<abi> directory.

Merged-In: I8389761dfbd28d181869d79f0bf988a1e4df2fca
Change-Id: I8389761dfbd28d181869d79f0bf988a1e4df2fca
(cherry picked from commit 1cb8dea625)
2017-05-16 23:30:35 +00:00
TreeHugger Robot
87f0e524ca Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" into oc-dev-plus-aosp 2017-05-16 22:24:02 +00:00
Alan Leung
1f5a362c97 Merge "Allows DX alternative Jar." am: 26d769ea3f am: 16168c016d
am: 5065fe2130

Change-Id: I6763da75914cd41c1bf3f78593c276c171401d0b
2017-05-16 22:05:53 +00:00
Tao Bao
0618e639a8 Makefile: Remove the duplicate lines for OTATOOLS.
Test: lunch ryu-userdebug; m otatools-package gives the same
      otatools.zip.
Change-Id: I917ba210f6161f15424b3ade86f41d14a20c99aa
2017-05-16 15:04:38 -07:00
Alan Leung
5065fe2130 Merge "Allows DX alternative Jar." am: 26d769ea3f
am: 16168c016d

Change-Id: Ic14ed3dbee96ac608a7e99b0072d5ac20ea4bf88
2017-05-16 22:02:23 +00:00
Alan Leung
16168c016d Merge "Allows DX alternative Jar."
am: 26d769ea3f

Change-Id: If8d94f7a9a39ea91c15419df7d4ddc300dcbe63d
2017-05-16 21:59:23 +00:00
Treehugger Robot
26d769ea3f Merge "Allows DX alternative Jar." 2017-05-16 21:50:49 +00:00
Jeff Vander Stoep
455a336fb4 Merge "sepolicy: remove all use of domain_deprecated" into oc-dev
am: 2e8ce7628d

Change-Id: I1f3da139ee66b7c1b8bc40ad4a7961851bd43939
2017-05-16 21:46:03 +00:00
TreeHugger Robot
2e8ce7628d Merge "sepolicy: remove all use of domain_deprecated" into oc-dev 2017-05-16 21:36:39 +00:00
Dan Willemsen
0cf52d84d3 Start deprecating OVERRIDE_BUILT_MODULE_PATH
We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can
directly specify the shared libraries to the linker.

So install both into the standard built module path, and declare a copy
rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can
incrementally move users from the old location to the standard path.

Test: m -j
Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
Merged-In: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 21:16:20 +00:00
Dan Willemsen
f72308af83 Start deprecating OVERRIDE_BUILT_MODULE_PATH
We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can
directly specify the shared libraries to the linker.

So install both into the standard built module path, and declare a copy
rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can
incrementally move users from the old location to the standard path.

Test: m -j
Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 21:16:06 +00:00
Alan Leung
83857b6cbd Allows DX alternative Jar.
Test: m -j20 ANDROID_COMPILE_WITH_JACK=false DX_ALT_JAR=/mnt/m02/dx_alt.jar

Change-Id: I6163280101ff973bc8202a82d2fed42cf0ce6209
(cherry picked from commit b147846b67)
2017-05-16 13:34:42 -07:00
David Sehr
b23a76ff71 Merge "Add dexdiag tool to images" into oc-dev
am: 953ff9f7d8

Change-Id: I9ae6a4a67f9f2b55593ae6a1b0c49485d8a99676
2017-05-16 20:29:48 +00:00
TreeHugger Robot
953ff9f7d8 Merge "Add dexdiag tool to images" into oc-dev 2017-05-16 20:18:55 +00:00
Colin Cross
61e47461c9 Merge "Normalize timestamps in host java libraries" am: 90edf85667 am: adb96ae66a
am: 62ba92c898

Change-Id: If9ecb061e33ef7913aa482f41eabf6b870bc5dab
2017-05-16 20:10:45 +00:00
Colin Cross
62ba92c898 Merge "Normalize timestamps in host java libraries" am: 90edf85667
am: adb96ae66a

Change-Id: Id880fa64d540526ad095f1a7cbfab88e185041e1
2017-05-16 20:04:44 +00:00
Colin Cross
adb96ae66a Merge "Normalize timestamps in host java libraries"
am: 90edf85667

Change-Id: I88c8abd5c1d3fec72f73d439253341b1c9ce778a
2017-05-16 19:58:44 +00:00
Treehugger Robot
90edf85667 Merge "Normalize timestamps in host java libraries" 2017-05-16 19:46:39 +00:00
Dan Willemsen
e74e77fe01 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean' am: 212c418ee7 am: 39187e8882
am: c6f9429171

Change-Id: Iedcb0edf8d51ac18ddbfaa25e36e2a6a25299912
2017-05-16 18:16:39 +00:00
Dan Willemsen
c6f9429171 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean' am: 212c418ee7
am: 39187e8882

Change-Id: If5b775a6a1f494b1b8d30b68cedbcaef0bb8e6bd
2017-05-16 18:13:38 +00:00
Sen Jiang
c5d5fdee22 Merge "Add support for avbtool in custom_images." am: 8a8ca3438b am: 7cdc14d8b0
am: c900a7cd48

Change-Id: I6612fc8c91ae83ff9da7fa7f78460f6d8249a687
2017-05-16 18:09:45 +00:00
Dan Willemsen
39187e8882 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
am: 212c418ee7

Change-Id: I6596af49a99a6167a8908525ff8fe1c16e456e31
2017-05-16 18:09:41 +00:00
Colin Cross
1664b90d67 Normalize timestamps in host java libraries
Remove timestamps from jar files in host java libraries to get
consistent results between builds to help with build artifact
caching.

Bug: 38215808
Test: sha1sum desugar.jar && touch Desugar.java && m -j desugar && sha1sum desugar.jar
Change-Id: I1ecac9b2b80f673937086686540ab0736259df1b
2017-05-16 11:07:28 -07:00
Sen Jiang
c900a7cd48 Merge "Add support for avbtool in custom_images." am: 8a8ca3438b
am: 7cdc14d8b0

Change-Id: I0697a6b6a612e7ad353def5f1e1497992bbb1807
2017-05-16 18:06:06 +00:00
Sen Jiang
7cdc14d8b0 Merge "Add support for avbtool in custom_images."
am: 8a8ca3438b

Change-Id: I254462e57038902852be421cbfb4cccab9dbe444
2017-05-16 18:02:37 +00:00
Dan Willemsen
212c418ee7 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
* changes:
  Move auto installclean to soong_ui
  Move version checking to soong_ui
  Move clean/clobber to soong_ui
  Allow disabling of CleanSpec functionality
2017-05-16 18:02:04 +00:00
Sen Jiang
8a8ca3438b Merge "Add support for avbtool in custom_images." 2017-05-16 17:55:54 +00:00
Ian Pedowitz
611c95a3f8 resolve merge conflicts of be9844a03c to oc-dev-plus-aosp
Change-Id: If7d78718d8f6349b9b386c30096bd83d8f94cbc9
2017-05-15 21:01:59 -07:00
Ian Pedowitz
e44086e272 Merge "Revert "Revert "O is API 26.""" into oc-dev
am: e46cc54ab1

Change-Id: Ie5bcfa449bfbad2ef0800f86a989db92d2c19087
2017-05-16 03:50:10 +00:00
Ian Pedowitz
be9844a03c Merge "O is 8.0.0 and REL" into oc-dev 2017-05-16 03:32:17 +00:00
Ian Pedowitz
e46cc54ab1 Merge "Revert "Revert "O is API 26.""" into oc-dev 2017-05-16 03:32:03 +00:00
Sen Jiang
5b0fe18feb Add support for avbtool in custom_images.
Set CUSTOM_IMAGE_AVB_ENABLE := true to enable avb, add_hashtree_footer
args can be added in CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS.

Bug: 38319818
Test: m custom_images

Change-Id: Ia452dc5ce8b55bcbd3abba9e965b72e78fd8c104
2017-05-15 17:34:42 -07:00
Dan Willemsen
85e55ceff2 Move auto installclean to soong_ui
This way kati doesn't need to keep state for which build got run last,
and we have to run kati less often. This was forcing another kati run
for an empty out directory, and a kati run (or two) every time you
switched products that shared a device.

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: lunch aosp_arm-eng; m -j blueprint_tools; lunch full-eng; m -j blueprint_tools; <repeat>
Change-Id: I825a0868fb7059016a940c76244527432e3e7cff
2017-05-15 14:18:10 -07:00
Dan Willemsen
3eb44160e0 Move version checking to soong_ui
This removes versions_checked.mk that caused kati to regenerate the
ninja file 3 times for a clean out directory. Kati needs to regenerate
every time that we write a file that we also read. soong_ui doesn't have
this problem.

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: $OUT_DIR/versions_checked.mk no longer exists
Change-Id: I14b67dc275ea3daa77a7315c2985dc73d77fd07c
2017-05-15 14:02:38 -07:00
Dan Willemsen
bd8ac3284d Move clean/clobber to soong_ui
So that we don't have to load up all the makefile state just to remove
the output directory.

Starting from a completely empty out directory:
 kati:    16s
 soong_ui: 2.0s

From a minimal out directory (m -j blueprint_tools):
 kati:     3.8s
 soong_ui: 0.4s

Test: m -j clean
Test: m -j clobber
Change-Id: Iec1ce032c7cc7ed102430080e857fc421b66309c
2017-05-15 14:02:38 -07:00
Dan Willemsen
3715001fe5 Allow disabling of CleanSpec functionality
This is only intended for testing purposes -- so that we can run build
system tests and verify that kati only gets run once for each
configuration. CleanSpecs necessarily write state that require us to
re-run kati twice.

Test: export NO_ANDROID_CLEANSPEC=true; rm -rf out; m -j; m -j
Change-Id: I635a8d8b6754dff82fbc7f20c500d06d7cf6c4f2
2017-05-15 14:02:38 -07:00
Jeff Vander Stoep
ec488e1fee sepolicy: remove all use of domain_deprecated
This attribute has been removed from public policy and is no longer
available.

Bug: 38316109
Test: build policy
Change-Id: I3407ced2d725de982e19b77345827de03d93c426
2017-05-15 13:25:06 -07:00
Yueyao Zhu
3a3d9c5837 Merge "add dtbo support for ota" am: 294d5c5f07 am: 793a9bb490
am: d2f336664c

Change-Id: I800efcf88ddb00d9624514b1c748e998f1ebd3e5
2017-05-15 17:01:55 +00:00
Yueyao Zhu
d2f336664c Merge "add dtbo support for ota" am: 294d5c5f07
am: 793a9bb490

Change-Id: Ia44e579c6c642ca745aa7d38ce73d3c89dd9a0c8
2017-05-15 16:59:56 +00:00
Yueyao Zhu
793a9bb490 Merge "add dtbo support for ota"
am: 294d5c5f07

Change-Id: Icf2a67ef36b2cbfa5d46e72b9e446cd7ed5e2d1c
2017-05-15 16:56:54 +00:00