Commit Graph

16825 Commits

Author SHA1 Message Date
Pete Gillin
176de85374 Merge changes I0d679648,I31542e7f am: 31d57588c9
am: 6414dde54e

Change-Id: I4b1dce04c3785d20d260af4cf1b23c3644c2277f
2019-11-11 09:40:02 -08:00
Pete Gillin
6414dde54e Merge changes I0d679648,I31542e7f
am: 31d57588c9

Change-Id: I3cfdaf2cfb6b5eef840f66c2c9fce5d82c2cd10b
2019-11-11 09:23:35 -08:00
Ulyana Trafimovich
7826a2f02a Merge "Revert^4 "Package dexpreopt artifacts for libcore jars in the ART apex."" am: b21ed4281e
am: 8ca57b35ea

Change-Id: If47489994d86ff2dc8518b9902a104e7c448ab68
2019-11-11 09:19:00 -08:00
Jeongik Cha
70b6bad4bd Merge "Rearrange import order" am: 5666126133
am: 1859bcadbe

Change-Id: Icf00d6ffb905b05b23e62e465bf8d8338c3f614c
2019-11-11 09:18:35 -08:00
Jeongik Cha
b2d11cb4e8 Merge "Enforce hidden apis usage in product(soong)" am: 80df439072
am: 8b822f70c3

Change-Id: I166841f43c65d97b52fd52c4eebba75ea02e7901
2019-11-11 09:17:23 -08:00
Jiyong Park
caed5cbe9a Merge "APEX now correctly tracks jni_lib dependencies" am: c70d3c3cf6
am: 4538f60bfe

Change-Id: Iaeafd2f49e8cf012055089f94c04ef556e645cd4
2019-11-11 09:15:10 -08:00
Paul Duffin
e556b3db03 Merge "Remove unnecessary constraint on previous_api" am: e4ef280532
am: dc931028c5

Change-Id: I05b586dc4463e5f57cef6cac4b74b6e1052373c5
2019-11-11 09:14:08 -08:00
Colin Cross
a45513cc6c Merge "Remove -Wno-thread-safety-negative" am: 075cc44a86
am: dcee4049d6

Change-Id: I6f237a7d3faf6470d6b67218cf335462ff4d5820
2019-11-11 09:11:57 -08:00
Mitch Phillips
d8e72556ad Merge "Soong frontend for shared library fuzzing." am: 722b02f84c
am: f484975c2d

Change-Id: Ie0a01efa75540cfc550d8da390a3bf3a174f2ac6
2019-11-11 09:10:05 -08:00
Ulyana Trafimovich
8ca57b35ea Merge "Revert^4 "Package dexpreopt artifacts for libcore jars in the ART apex.""
am: b21ed4281e

Change-Id: Idca5a2d9e14485efb99451ce689a470ce99ea2a8
2019-11-11 09:07:15 -08:00
Jeongik Cha
1859bcadbe Merge "Rearrange import order"
am: 5666126133

Change-Id: I1535f14d7dda5fa05d3d417b58ea55ffc262c21a
2019-11-11 09:06:44 -08:00
Jooyung Han
897561c3e1 Merge "apex_manifest in protobuf binary format" am: d0e39622c7
am: 2d6a99599f

Change-Id: I58333f5faa6fc2886d1b9227e1f88e0108568a0a
2019-11-11 09:05:29 -08:00
Jeongik Cha
8b822f70c3 Merge "Enforce hidden apis usage in product(soong)"
am: 80df439072

Change-Id: I88469277c70aeae5e66ceabe41e000dd113ef3e7
2019-11-11 09:05:13 -08:00
Jiyong Park
4538f60bfe Merge "APEX now correctly tracks jni_lib dependencies"
am: c70d3c3cf6

Change-Id: I1e1c7a8d9e230aa7e65ef94448fbebba8b7fc19f
2019-11-11 09:05:01 -08:00
Paul Duffin
dc931028c5 Merge "Remove unnecessary constraint on previous_api"
am: e4ef280532

Change-Id: I6951a5df42c4153c813a105f7fed5416a79edd61
2019-11-11 09:03:35 -08:00
Colin Cross
dcee4049d6 Merge "Remove -Wno-thread-safety-negative"
am: 075cc44a86

Change-Id: I626d7fa1a24599414446baba7e2ee9618a11fc28
2019-11-11 09:03:06 -08:00
Mitch Phillips
f484975c2d Merge "Soong frontend for shared library fuzzing."
am: 722b02f84c

Change-Id: I86c282af40aa0c71b9c537e8e92616280ab64581
2019-11-11 09:02:27 -08:00
Jooyung Han
2d6a99599f Merge "apex_manifest in protobuf binary format"
am: d0e39622c7

Change-Id: Ieaf7d0535d58ac103f87c130c66dbc1d8557ccb0
2019-11-11 09:01:04 -08:00
Pete Gillin
31d57588c9 Merge changes I0d679648,I31542e7f
* changes:
  Remove the EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN option.
  Add a new option OVERRIDE_JLINK_VERSION_NUMBER.
2019-11-11 11:59:36 +00:00
Pete Gillin
a7a3d64a36 Remove the EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN option.
Previously, this setting environment variable to false reverted to an
OpenJDK 9 toolchain. This change removes that option.

Test: m core-all-system-modules
Test: zcat out/verbose.log.gz | grep 'prebuilts/jdk/jdk[0-9]*'
Test: EXPERIMENTAL_USE_OPENJDK11_TOOLCHAIN=false m core-all-system-modules (fails)
Bug: 131683177
Change-Id: I0d679648e1236925ce3ef7e1652379127e846b00
2019-11-11 11:03:58 +00:00
Ulyana Trafimovich
b21ed4281e Merge "Revert^4 "Package dexpreopt artifacts for libcore jars in the ART apex."" 2019-11-11 10:30:12 +00:00
Treehugger Robot
5666126133 Merge "Rearrange import order" 2019-11-11 04:57:09 +00:00
Treehugger Robot
80df439072 Merge "Enforce hidden apis usage in product(soong)" 2019-11-11 02:05:16 +00:00
Jeongik Cha
28df257fea Rearrange import order
Bug: 132780927
Test: m
Change-Id: I4b2c40bb0fb3dd5ff31f65811a6fef28e946f028
2019-11-11 10:46:36 +09:00
Treehugger Robot
c70d3c3cf6 Merge "APEX now correctly tracks jni_lib dependencies" 2019-11-09 13:53:08 +00:00
Treehugger Robot
e4ef280532 Merge "Remove unnecessary constraint on previous_api" 2019-11-09 11:12:51 +00:00
Colin Cross
075cc44a86 Merge "Remove -Wno-thread-safety-negative" 2019-11-09 02:34:29 +00:00
Treehugger Robot
722b02f84c Merge "Soong frontend for shared library fuzzing." 2019-11-08 21:35:08 +00:00
Colin Cross
23d988d54a Remove -Wno-thread-safety-negative
-Wthread-safety-negative was disabled because it requires locks to
support an operator!(), and std::mutex in libc++ does not.  Disabling
it everywhere was preventing it being used for modules that want to
opt in to using it and provide their own lock that supports
operator!().  Modules that use -Weverything should either stop using
 -Weverything (preferred), or add -Wno-thread-safety-negative.

Bug: 143713277
Test: m native
Change-Id: I0b84679a806a21b16cabe7f739fde61c3efe2cbe
2019-11-08 18:27:40 +00:00
Jooyung Han
d0e39622c7 Merge "apex_manifest in protobuf binary format" 2019-11-08 17:33:38 +00:00
Mitch Phillips
e1ee1a1297 Soong frontend for shared library fuzzing.
Additional context (for Googlers): go/android-fuzzing-shared

This patch adds the Soong frontend for shared library fuzzing. We
traverse dependencies at soong install time to find all transient shared
libraries that $module depends on. We then ask the Make backend to
depend on the shared library.

We also create the source:destination mappings between where the shared
libraries are built to where they should be installed to for fuzzing.
This is then depended on by the Make backend.

Bug: N/A
Test: m fuzz, note the contents of $ANDROID_PRODUCT_OUT/data/fuzz/lib,
and out/soong/fuzz-target-*.zip now has shared libraries.

Change-Id: Id7afbd34bc9c055110af96cd3c668b730d404aee
2019-11-08 08:48:13 -08:00
Ulyana Trafimovich
de534414b3 Revert^4 "Package dexpreopt artifacts for libcore jars in the ART apex."
This reverts commit bf0e47648a.

Reason for revert: coverage build with EMMA_INSTRUMENT_FRAMEWORK=true
is fixed by inspecting the environment variable and not generating
boot image in case it is set.

Dexpreopt artifacts for the libcore part of the boot class path are
now packaged in the ART apex. The system image still contains
dexpreopt artifacts for the full set of boot class path libraries
(both libcore and framework); the libcore part will be removed and
boot image extension will be used in a follow-up CL.

Since this is specific to the ART apex and makes no sense for other
apexes, the implementation adds a boolean flag "is ART apex" rather
than a new apex module property.

Build rules for the new set of dexpreopt artifacts are created using
a new variant of the global boot image config. Previously we had two
variants: "default" (for the system image) and "apex" (for the
JIT-zygote experiment). This patch adds a third "art" variant.

Test: m
Test: m art/build/apex/runtests.sh

Bug: 144091989
Change-Id: I113c0d39222d6d697cb62cd09d5010607872fc2b
2019-11-08 12:48:53 +00:00
Pete Gillin
a2affbbb00 Add a new option OVERRIDE_JLINK_VERSION_NUMBER.
This is a counterpart to the existing OVERRIDE_ANDROID_JAVA_HOME,
which is not very useful by itself in a Java module world. All jlink
commands will fail if a user sets OVERRIDE_ANDROID_JAVA_HOME without
setting OVERRIDE_JLINK_VERSION_NUMBER to the corresponding value
(unless they happen to be specifying a different OpenJDK 11
toolchain).

Test: OVERRIDE_ANDROID_JAVA_HOME=my-jdk10 OVERRIDE_JLINK_VERSION_NUMBER=10 m core-all-system-modules (with an OpenJDK 10 toolchain symlinked at my-jdk10 just for testing)
Test: zcat out/verbose.log.gz | grep 'jmod create'
Bug: 131683177
Change-Id: I31542e7f46303bba538d998171a3efe6d0215c7b
2019-11-08 12:34:07 +00:00
Martin Stjernholm
632f7546c6 Merge "Revert submission of topic 'libdl_android-in-apex'" am: 3980ced987
am: 6d01bf3b82

Change-Id: I1498c12778ab64d311b3cd91cfb72af403df6b1c
2019-11-08 04:12:05 -08:00
Martin Stjernholm
6d01bf3b82 Merge "Revert submission of topic 'libdl_android-in-apex'"
am: 3980ced987

Change-Id: I25399e58f549275835db2ccd5e4245d3eb3bc230
2019-11-08 04:06:03 -08:00
Martin Stjernholm
3980ced987 Merge "Revert submission of topic 'libdl_android-in-apex'" 2019-11-08 11:51:39 +00:00
Paul Duffin
13a9dd604b Remove unnecessary constraint on previous_api
The constraint requires the previous_api property to be specified
unless validating nullness. However, there is no reason within the
Soong code why that should be.

The only use of previous_api is as the argument to the metalava
--migrate-nullness option which is only added when previous_api is
specified. So, there is no reason in the Soong code for the
constraint.

Metalava also does not require the --migrate-nullness option to be
specified unless validating nullness. So, there is no reason in
metalava for the constraint.

It is therefore safe to remove the constraint.

Bug: 142113521
Test: m checkbuild
Change-Id: I189071e215e928fdf43a39a03d540732743b7a32
2019-11-08 08:23:14 +00:00
Jiyong Park
8be103b04c APEX now correctly tracks jni_lib dependencies
Bug: 144135069
Test: m (apex_test.go amended)
Change-Id: If9dde4e2e62c2642267dbcac68bab76a032682c0
2019-11-08 15:53:48 +09:00
Colin Cross
157df18e9a Merge changes from topic "reorder-cflags" am: 1f38237c12
am: 17da9db309

Change-Id: I8b5082c80b9c5647576a9732ce6d7945babc082b
2019-11-07 21:31:07 -08:00
Colin Cross
17da9db309 Merge changes from topic "reorder-cflags"
am: 1f38237c12

Change-Id: Icfbfa6f1ce2840d5d86b407ce50c653ef8195c03
2019-11-07 21:25:43 -08:00
Colin Cross
1f38237c12 Merge changes from topic "reorder-cflags"
* changes:
  Reorder local and global flags
  Split local and global cflags
2019-11-08 05:07:34 +00:00
Jooyung Han
01a3ee287a apex_manifest in protobuf binary format
For Q compatibility, .json files are also bundled.

Three different apex_manifest files are built from input.
- apex_manifest.json: Q-readable .json file
- apex_manifest_full.json: input + dependency
- apex_manifest.pb: apex: converted from apex_manifest_full.json

apexer will handle these files.

Bug: 143654022
Test: m
Change-Id: I9697094057f0c0543282b1b46b7535cf21431176
2019-11-08 13:40:45 +09:00
Jooyung Han
128c4dd453 Merge changes from topic "libraries-txt-to-soong" am: 3e38230af7
am: 1813458be8

Change-Id: I852d35e2d8d0bf86fcf6df393925f5611c36286f
2019-11-07 20:20:00 -08:00
Jooyung Han
1813458be8 Merge changes from topic "libraries-txt-to-soong"
am: 3e38230af7

Change-Id: I57b7f1ebce6c0c3abfb6ea1f60e51d1d867d89e5
2019-11-07 20:13:57 -08:00
Treehugger Robot
3e38230af7 Merge changes from topic "libraries-txt-to-soong"
* changes:
  VNDK APEX contains related *.libraries.txt files
  Make vndk*.libraries.txt as soong modules
2019-11-08 04:04:14 +00:00
Jaewoong Jung
54e6b49ba6 Merge "Install signed split apks." am: 722b63c4c2
am: ff5cc88c38

Change-Id: I8656e448c748153c0cf7584c6a255b90cc900f6a
2019-11-07 17:34:32 -08:00
Jaewoong Jung
ff5cc88c38 Merge "Install signed split apks."
am: 722b63c4c2

Change-Id: Ic0688168ab64af7d9082cf42b33670f2b1160dde
2019-11-07 17:30:47 -08:00
Jiyong Park
971c649b6d Merge "SDK snapshot is dist'ed" am: d0a4878b49
am: ed00b7fa5f

Change-Id: Ie0cd4843da30136a8fcfddf35f4d9358dcb453d5
2019-11-07 17:16:48 -08:00
Jaewoong Jung
722b63c4c2 Merge "Install signed split apks." 2019-11-08 01:12:06 +00:00
Jiyong Park
ed00b7fa5f Merge "SDK snapshot is dist'ed"
am: d0a4878b49

Change-Id: I17dac352a64bce727b2ae958c8886afece014d2a
2019-11-07 17:11:18 -08:00