Commit graph

37345 commits

Author SHA1 Message Date
Tao Bao
4a0d1f2ece Fix the symlink detection when signing TF.zip.
am: 3eb353cdb0

Change-Id: I00c256d5eacab5e60c1292f9572eaaaee5a1c11e
2017-05-23 20:25:57 +00:00
Tao Bao
3eb353cdb0 Fix the symlink detection when signing TF.zip.
We used to check for 'attr >> 16 == 0xa1ff' (i.e. 0o120777) to detect
symlinks in the input target_files zip (TF.zip). This becomes broken
after we switch to soong_zip, which packs symlinks with 0o120700.

This CL fixes the issue by using stat.S_ISLNK() instead.

Note that we don't need to stage the files with the exact permission
bits as in the input TF.zip. Because this part is covered by mkbootfs
by using the canned or the compiled-in fs_config - as long as the
files/directories are accessible and the symlinks are created.

Bug: 38455129
Test: sign_target_files_apks.py on bullhead TF.zip. Check the
      checksums in SYSTEM/bin/install-recovery.sh.
Change-Id: I51c1fc9a257fb3f18c16c2ed71528abaa6f7d9c9
(cherry picked from commit 406050bdb6)
2017-05-23 11:18:26 -07:00
Tobias Thierer
57fa914a79 Merge "Fix fragile assumptions about build toolchain. (attempt #2)" am: 48ee187e98 am: b9511c87b6
am: d7f60e4fbc

Change-Id: I7cff67ba4208293eacf7a9346c99b9f964ba270b
2017-05-23 12:26:25 +00:00
Tobias Thierer
d7f60e4fbc Merge "Fix fragile assumptions about build toolchain. (attempt #2)" am: 48ee187e98
am: b9511c87b6

Change-Id: I1901b37b8cd42e571f17bb986f64a3979290b1c6
2017-05-23 12:23:54 +00:00
Tobias Thierer
b9511c87b6 Merge "Fix fragile assumptions about build toolchain. (attempt #2)"
am: 48ee187e98

Change-Id: Ie36864832ac1364b6a2affa547ec71d7b04d583d
2017-05-23 12:21:55 +00:00
Tobias Thierer
48ee187e98 Merge "Fix fragile assumptions about build toolchain. (attempt #2)" 2017-05-23 12:14:54 +00:00
Isaac Chen
43c6e2b649 Merge "Generic AOSP system image for non-A/B arm devices" into oc-dev
am: 66d4710933

Change-Id: I9d264f8e5a08984813e95b168eba8599b23ea521
2017-05-23 02:27:44 +00:00
TreeHugger Robot
66d4710933 Merge "Generic AOSP system image for non-A/B arm devices" into oc-dev 2017-05-23 02:21:03 +00:00
Colin Cross
a1b843c2b6 Merge "Add LOCAL_JAR_PROCESSOR" am: 9f52f0d17d am: abcbe9ab86
am: dcc9240a71

Change-Id: I21ecc09b9f5678746b8bb02056583f10e90e71ee
2017-05-23 02:12:43 +00:00
Colin Cross
dcc9240a71 Merge "Add LOCAL_JAR_PROCESSOR" am: 9f52f0d17d
am: abcbe9ab86

Change-Id: Ibf50a9ccf5fc4ffd9c2197c2c876eb9718fafe3d
2017-05-23 02:10:42 +00:00
Colin Cross
abcbe9ab86 Merge "Add LOCAL_JAR_PROCESSOR"
am: 9f52f0d17d

Change-Id: I28b567ecbffc8592701358906faf5795e2b362da
2017-05-23 02:07:12 +00:00
Treehugger Robot
9f52f0d17d Merge "Add LOCAL_JAR_PROCESSOR" 2017-05-23 02:03:09 +00:00
Colin Cross
f8a49c5a37 Add LOCAL_JAR_PROCESSOR
Allow using a host java library as an intermediate processor step
after javac but before desugar, proguard, or dx.

Test: manual
Change-Id: I7fb843e10d96c0167f6e4371582fabcc1454521f
2017-05-22 17:30:13 -07:00
Tobias Thierer
0ed47f7fd1 Fix fragile assumptions about build toolchain. (attempt #2)
This CL resubmits a fixed version of commit
e2a8da2683.

This CL applies the following changes:

- explicitly set the path where desugar will dump temporary class files.
  This ensures that the system property is set before it is read during
  InnerClassLambdaMetafactory.<clinit>. Before this CL, the system
  property was set by Desugar.createAndRegisterLambdaDumpDirectory(),
  which may run too late.

- explicitly specify -source 1.8 for droiddoc's javadoc run.
  Previously, the command used the language version of the build
  toolchain, which might fail due the backward-incompatible restrictions
  imposed by the proposed module system.

  Some Android build targets use LOCAL_JAVA_LANGUAGE_VERSION 1.7,
  but droiddoc combines sources from multiple build targets and there
  where no backwards incompatible changes in 1.8, so it should be fine
  to use 1.8 for code from either language level.

Bug: 38318052
Bug: 38225656
Bug: 38177295
Test: make clean && make ANDROID_COMPILE_WITH_JACK=false checkbuild tests \
      && make checkbuild tests
      (using OpenJDK 8 toolchain)

Change-Id: I2fffe6668747f48be44e34c67332af9b8a996d2a
2017-05-22 23:03:24 +01:00
Steven Moreland
516ca43031 Add soong variable for PRODUCT_FULL_TREBLE.
am: f32645f1f4  -s ours

Change-Id: Ibfc45279872b4f0c15a18798618caa6edda09734
2017-05-22 17:15:13 +00:00
Tobias Thierer
5497bc1aaa Merge "Make: Don't rely on presence of tools.jar in toolchain." am: 00e3bd93da am: bf0f0e26d7
am: ca910f5a42

Change-Id: I5172ca890b34a623f9726307b5ce0b778294254a
2017-05-22 09:58:25 +00:00
Tobias Thierer
ca910f5a42 Merge "Make: Don't rely on presence of tools.jar in toolchain." am: 00e3bd93da
am: bf0f0e26d7

Change-Id: I4b9b25fa35a3a4e59f47d4246a5cb8ca2efad6f1
2017-05-22 09:52:52 +00:00
Tobias Thierer
bf0f0e26d7 Merge "Make: Don't rely on presence of tools.jar in toolchain."
am: 00e3bd93da

Change-Id: Idf231d055504d19ab963a6894fabecdd565e142e
2017-05-22 09:42:22 +00:00
Tobias Thierer
00e3bd93da Merge "Make: Don't rely on presence of tools.jar in toolchain." 2017-05-22 09:33:31 +00:00
Tobias Thierer
3c4c0b6ab3 Make: Don't rely on presence of tools.jar in toolchain.
Some cts, doclava and javassist code uses private APIs that require
tools.jar to be on the classpath when building with the standard
OpenJDK 8 toolchain. However, OpenJDK 9 toolchains do not have this
file nor require it to be on the classpath. The reliance on the
presence of tools.jar means that AOSP can currently not build on
such toolchains.

After this CL, when EXPERIMENTAL_USE_OPENJDK9 is set, the value of
HOST_JDK_TOOLS_JAR is empty.

That flag can be set via:

export EXPERIMENTAL_USE_OPENJDK9=true

and unset via:

unset EXPERIMENTAL_USE_OPENJDK9

Test: make checkbuild (using OpenJDK 8 toolchain)
Test: manually confirmed that device boots
Bug: 38177295
Change-Id: Icc5451b51e44a574fd21024d434ed1fa8711de17
2017-05-20 14:17:05 +01:00
Steven Moreland
841508562d Merge "Add soong variable for PRODUCT_FULL_TREBLE." am: ec0dec8599 am: 7c318e8914
am: 094743b773

Change-Id: I3e44906669e251241b94029087040bdeab49c662
2017-05-20 00:19:34 +00:00
Steven Moreland
094743b773 Merge "Add soong variable for PRODUCT_FULL_TREBLE." am: ec0dec8599
am: 7c318e8914

Change-Id: I2c969e1d79ab9f536900212c9def56fb3c5b4946
2017-05-20 00:17:03 +00:00
Steven Moreland
7c318e8914 Merge "Add soong variable for PRODUCT_FULL_TREBLE."
am: ec0dec8599

Change-Id: I9790d4bb6d3bab336c9cf040b43b695ec65b341d
2017-05-20 00:13:07 +00:00
Treehugger Robot
ec0dec8599 Merge "Add soong variable for PRODUCT_FULL_TREBLE." 2017-05-20 00:05:51 +00:00
Dan Willemsen
8148653266 Merge "Use installed module stem for .so soname" am: 1c7debc95c am: d31cfcbbbb
am: 418db57b0e

Change-Id: Ie725528c73889c5c89d4207a6af2fa94a4299d5d
2017-05-19 23:46:56 +00:00
Dan Willemsen
418db57b0e Merge "Use installed module stem for .so soname" am: 1c7debc95c
am: d31cfcbbbb

Change-Id: Id91114bd017c0d633f73dbcb21056b47d2bffba1
2017-05-19 23:44:27 +00:00
Dan Willemsen
d31cfcbbbb Merge "Use installed module stem for .so soname"
am: 1c7debc95c

Change-Id: Ibb31ffb25d824642376b1301c27e3bcbc61398a6
2017-05-19 23:42:30 +00:00
Treehugger Robot
1c7debc95c Merge "Use installed module stem for .so soname" 2017-05-19 23:34:58 +00:00
Steven Moreland
f32645f1f4 Add soong variable for PRODUCT_FULL_TREBLE.
Required to preserve sane defaults for old codebases.

Test: inspect soong.variables
Test: ensure PRODUCT_SHIPPING_API_LEVEL is set in config.mk
Bug: 38415912
Merged-In: I0244fb02754663be3106391c9360fd1b2cc00d4a
Change-Id: I0244fb02754663be3106391c9360fd1b2cc00d4a
2017-05-19 15:54:18 -07:00
Dan Willemsen
50e8753686 Use installed module stem for .so soname
So that the SONAME will match the actual installed name. This allows two
shared libraries (with different LOCAL_MODULE names) to be built with
the same name, but in different locations. So to partially emulate
Soong's vendor_available, you could define:

  include $(CLEAR_VARS)
  LOCAL_MODULE := libmyutils
  ...
  include $(BUILD_SHARED_LIBRARY)

  include $(CLEAR_VARS)
  LOCAL_MODULE := libmyutils_vendor
  LOCAL_VENDOR_MODULE := true
  LOCAL_INSTALLED_MODULE_STEM := libmyutils.so
  ...
  include $(BUILD_SHARED_LIBRARY)

All of the users would need to explicitly use libmyutils vs
libmyutils_vendor based on how their runtime lookup paths are going to
work, but it will install into both places:

  /system/lib/libmyutils.so
  /vendor/lib/libmyutils.so

Bug: 38225484
Test: Example similar to above, ensure DT_NEEDED / DT_SONAME are correct
Test: multiproduct_kati to verify the only module this changes on
      master is libart_fake
Change-Id: Ifa4b8adff50d8b5a754c70ce8e865b05f9889c6c
2017-05-19 14:30:12 -07:00
Mark Salyzyn
c2eb5566b6 Merge "Android.mk: clear variable at end of use" am: 5d9c1e7430 am: edf9c79e42
am: 05f9a1cec6

Change-Id: I628b58bc041c470ba6d4f426a0e09f6bca581132
2017-05-19 20:57:13 +00:00
Mark Salyzyn
05f9a1cec6 Merge "Android.mk: clear variable at end of use" am: 5d9c1e7430
am: edf9c79e42

Change-Id: I29ee7416c0e1f59d905c194b1f3baf710306587b
2017-05-19 20:55:42 +00:00
Mark Salyzyn
edf9c79e42 Merge "Android.mk: clear variable at end of use"
am: 5d9c1e7430

Change-Id: I4a57920cbf83012f8fa6c845d095c2211b2e1d26
2017-05-19 20:53:47 +00:00
Mark Salyzyn
5d9c1e7430 Merge "Android.mk: clear variable at end of use" 2017-05-19 20:47:32 +00:00
William Roberts
6b19e495b1 Android.mk: clear variable at end of use
Clear fs_config_generate_extra_partition_list after use.

Test: build fs_config_files and fs_config_dirs targets.

Change-Id: Ie18bcd2df2ff1becb178e9ba45d226e2e9a8faab
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-05-19 20:14:27 +00:00
Adam Seaton
7a14f5cc8a [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours am: 9f5ac04bf6 -s ours am: 43c5f2c0e6 -s ours am: dacf55698c -s ours
am: b7abad0889

Change-Id: Iea0adff02d72f9f815d5b3da147da85fe88ea440
2017-05-19 19:56:14 +00:00
Adam Seaton
b7abad0889 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours am: 9f5ac04bf6 -s ours am: 43c5f2c0e6 -s ours
am: dacf55698c  -s ours

Change-Id: I825afe3a5ad95b1ab79a13c622cf760ed3ac66ae
2017-05-19 19:54:37 +00:00
Android Build Merger (Role)
d5b83851c1 Merge "[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599 am: e5875ba6ec -s ours am: c539c7656d" into oc-dev-plus-aosp 2017-05-19 19:53:26 +00:00
Adam Seaton
0714d500d0 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599 am: e5875ba6ec -s ours
am: c539c7656d

Change-Id: Id62adac37d1815ed6a4250531caa49c22ab4d6c0
2017-05-19 19:53:08 +00:00
Adam Seaton
dacf55698c [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours am: 9f5ac04bf6 -s ours
am: 43c5f2c0e6  -s ours

Change-Id: I700d0548236399f2a63fd95d09c5208a76f2e645
2017-05-19 19:53:07 +00:00
Adam Seaton
528e203eb3 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599 am: e5875ba6ec
am: 5886c67062  -s ours

Change-Id: I947f75033fd0c26cf89cde2e7ad2be86f77cec47
2017-05-19 19:53:07 +00:00
Adam Seaton
5886c67062 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599
am: e5875ba6ec

Change-Id: Ib28ca7ff73808c20b4c994fa9b7e59dd7405386c
2017-05-19 19:51:09 +00:00
Adam Seaton
c539c7656d [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599
am: e5875ba6ec  -s ours

Change-Id: I0a906fcbbea11112c9cfd495eb40a179725f4b33
2017-05-19 19:51:07 +00:00
Adam Seaton
43c5f2c0e6 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours
am: 9f5ac04bf6  -s ours

Change-Id: I00587c43e6dce0d9fc7eee81936a5479eb067411
2017-05-19 19:51:07 +00:00
Adam Seaton
e5875ba6ec [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8
am: 111b9d5599

Change-Id: I50989e2944625a0615942ed3d08d5e28dba10aec
2017-05-19 19:49:39 +00:00
Adam Seaton
9f5ac04bf6 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours
am: 3f08725f86  -s ours

Change-Id: I5b2260c4adc4169609293ff6a33198dc80c05a72
2017-05-19 19:49:37 +00:00
Adam Seaton
111b9d5599 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b
am: 9f80f090a8

Change-Id: I30a94cf4626db5604c5617c1db5b80e1d8a55afb
2017-05-19 19:47:38 +00:00
Adam Seaton
3f08725f86 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b
am: 9f80f090a8  -s ours

Change-Id: Ic375882bc160265728515b8553041f7031744738
2017-05-19 19:47:36 +00:00
Adam Seaton
3b7bfd7ed6 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f -s ours am: 588a0f8523 -s ours am: 5311ff5db5 -s ours am: 674c03c38f -s ours am: 521f5df845 -s ours
am: ca020917a2

Change-Id: Ideb618b8cd2abc7d07bdc033349671caab3d1558
2017-05-19 19:46:28 +00:00
Adam Seaton
a7a5c77fc6 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 -s ours am: 0ac3704512 -s ours am: 0c1c0aa4b5 -s ours am: e19a6c202f -s ours am: 13f423f0e1 -s ours
am: 49f4c0055e

Change-Id: I98933a6186e3bb990d68ea0d9263cce6a1b502d0
2017-05-19 19:46:09 +00:00