Commit graph

18654 commits

Author SHA1 Message Date
Bob Badour
40017be1c3 Merge "Unless overridden include LICENSE files in notices." 2020-02-26 20:37:22 +00:00
David Srbecky
c177ebeca9 Distinguish boot images by target rather than arch
We plan to add boot image variants for host tests.
Distinguishing the variants by arch does not work,
since both host and device can have the same arch.

Change-Id: Iea73c77367affb074f97a0fc318389417ce537da
2020-02-26 17:04:21 +00:00
Automerger Merge Worker
35189efd1d Convert cc to AndroidMkEntries am: d80cbca76d
Change-Id: I509d14736842b97489dc63c01ad0b0412124154c
2020-02-26 16:51:59 +00:00
Colin Cross
d80cbca76d Convert cc to AndroidMkEntries
Use AndroidMkEntries so the next patch can use ExtraFooters, which
doesn't exist in AndroidMkData.

Test: manually diff out/soong/Android.aosp_x86_64.mk
Change-Id: Ia3006b6747813693cf7e2b536030b21f3109f538
2020-02-25 19:53:04 -08:00
Automerger Merge Worker
52b4afe8f2 Merge "apex: do not follow jni_libs from android_app" am: 077f9a44f9
Change-Id: Ibe282ebd930a6a53026eda08a6abb1bc28894fb5
2020-02-26 02:55:48 +00:00
Jooyung Han
077f9a44f9 Merge "apex: do not follow jni_libs from android_app" 2020-02-26 02:35:10 +00:00
Dan Shi
67a8834735 Support arch variant for data attribute
Bug: 143220441
Test: atest VtsHalDrmV1_2TargetTest
Change-Id: I2381f78b486852da267caa363b4c4cb5660c9055
2020-02-25 16:34:39 -08:00
Automerger Merge Worker
0c34e7e308 Merge "Update ike.jar's name in code coverage configuration" am: 9a63ee1b4f
Change-Id: I0484fed50a5b727c854e194fab2160315d07aca0
2020-02-25 22:04:10 +00:00
Yan Yan
9a63ee1b4f Merge "Update ike.jar's name in code coverage configuration" 2020-02-25 21:56:43 +00:00
Colin Cross
b72c909899 Collect metrics from inside soong_build
Collect the number of modules and variants and some basic statistics
on memory usage inside soong_build by writing out a proto that is
read back in by soong_ui.

Test: examine soong.log
Change-Id: I6926876377a4f6229cf41fdbf166ae03c885ea55
2020-02-25 20:50:00 +00:00
Automerger Merge Worker
f299645528 Merge "Fix forwarding a vararg parameter" am: f3be200bcf
Change-Id: I86b418711449eed67a543d190e0106f5f6784291
2020-02-25 20:16:57 +00:00
Treehugger Robot
f3be200bcf Merge "Fix forwarding a vararg parameter" 2020-02-25 20:06:53 +00:00
Sasha Smundak
b8f46cd2d6 In kzip files, compilation unit paths should be relative to top.
Fixes inter-module cross references.

Bug: 137798757
Test: build kzips, verify paths
Change-Id: I5cf64972ae61b869c96aafea5de0a48303d9af83
2020-02-25 11:22:17 -08:00
Jooyung Han
cd87c69de4 Fix forwarding a vararg parameter
vararg parameter is passed without unpacking, which prints
not-so-useful value.

Bug: N/A
Test: m
Change-Id: I03f011557d10c6e2bc06813491cd8df2cce7c6ea
2020-02-26 02:05:18 +09:00
Automerger Merge Worker
cca4f68ddf Merge "Add min_sdk_version property to apexes" am: 414d50c35d
Change-Id: I263f29ad9715077bb0de04aca318109ffd4b5ffd
2020-02-25 15:49:07 +00:00
Colin Cross
414d50c35d Merge "Add min_sdk_version property to apexes" 2020-02-25 15:34:26 +00:00
Jooyung Han
b7bebe2616 apex: do not follow jni_libs from android_app
Because APK-in-APEX embeds its jni_libs in it. We don't have to follow
deps of jni_libs.

Bug: 146992436
Test: m com.android.tethering
      deapexer extract com.android.tethering.apex apex
      ls apex # there should be no /lib dir

Change-Id: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
2020-02-25 20:47:04 +09:00
Automerger Merge Worker
92e2a41ea0 Merge "Add support for cc_library_headers in sdk/module_exports" am: e1fd6a9bd8
Change-Id: I7bb61648a44cf3db37309a84da1f67c19a2beee4
2020-02-25 10:41:15 +00:00
Automerger Merge Worker
2482182b3b Merge "Prune any empty property sets from the modules before transforming" am: 78036c8afa
Change-Id: Ia8e8cd67d95c13811f8abb4971884dc7ac609dba
2020-02-25 10:41:10 +00:00
Automerger Merge Worker
0f0bb62979 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" am: 2125138f25
Change-Id: I2ebff725f3053392d5393bff07b849de7fb76617
2020-02-25 10:41:04 +00:00
Automerger Merge Worker
f8809f7dc6 Merge "Add support for transforming a property set after its contents" am: cbe936cc43
Change-Id: I6d1d7dac0224e5d77ea1acb3a40b8870ea29bcca
2020-02-25 10:40:59 +00:00
Automerger Merge Worker
2dd1518f4a Merge "Fix issues with bp transformation" am: e574be5c07
Change-Id: Ib53635316c2a96b39668ac25b844a263f71506fe
2020-02-25 10:40:48 +00:00
Paul Duffin
e1fd6a9bd8 Merge "Add support for cc_library_headers in sdk/module_exports" 2020-02-25 10:29:39 +00:00
Paul Duffin
78036c8afa Merge "Prune any empty property sets from the modules before transforming" 2020-02-25 10:28:52 +00:00
Paul Duffin
2125138f25 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" 2020-02-25 10:28:35 +00:00
Paul Duffin
cbe936cc43 Merge "Add support for transforming a property set after its contents" 2020-02-25 10:21:34 +00:00
Paul Duffin
e574be5c07 Merge "Fix issues with bp transformation" 2020-02-25 10:21:21 +00:00
evitayan
2e5606736f Update ike.jar's name in code coverage configuration
ike has been renamed to android.net.ipsec.ike. This commit applies
this name updates to the code coverage configuration.

Bug: 148625578
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false android.net.ipsec.ike.com.android.ipsec_intermediates/ contains jacoco-report-classes.jar
Change-Id: Ic46a1091899eb5bc9560739ec86a9bea08585075
2020-02-25 07:43:43 +00:00
Automerger Merge Worker
e45d4d1612 Merge changes Ibaf383c4,I2b1c0736 am: 139fa4320f
Change-Id: I71377d3a6e5395732aee75e3e129d3684b523c13
2020-02-25 07:15:26 +00:00
Jiyong Park
139fa4320f Merge changes Ibaf383c4,I2b1c0736
* changes:
  Expect added members for instrumented modules
  Reland "Turn on the instrumentation by default for the java code in APEXes"
2020-02-25 07:02:33 +00:00
Jiyong Park
93e57a0b86 Expect added members for instrumented modules
hiddenapi expects that all members in a class to have corresponding hidden
API flags. However, this can't be satisfied when the java module having
the class is instrumented; JaCoCo added a few number of synthetic
members. In this case, give 'no-force-assign-all' option to the hidden
api tool so that it doesn't complain about the synthetic methods.

Also, disabling instrumenting jacocoagent itself, because it doesn't
make sense.

Exempt-From-Owner-Approval: PS3 fixes a typo in a comment. PS2 got ORV.

Bug: 149353192
Test: SKIP_ABI_CHECKS=true EMMA_INSTRUMENT=true
EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true m
out/soong/.intermediates/external/apache-xml/apache-xml/android_common_com.android.art.debug/hiddenapi/unaligned/unaligned.jar
Change-Id: Ibaf383c439945ab664e885af319548b56e2c8cb6
2020-02-25 07:01:18 +00:00
Automerger Merge Worker
3c025bf921 Merge changes Idd50ed38,Icbc86b21 am: 4483601b58
Change-Id: I314ea3ce0626bc3db15ac5b5caadbcd276428365
2020-02-25 04:09:28 +00:00
Automerger Merge Worker
a00f6b6500 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." am: a35e3ffd96
Change-Id: I68d7f414762f2a480346eddc0c68ed6bbfaf92a0
2020-02-25 04:09:21 +00:00
Treehugger Robot
4483601b58 Merge changes Idd50ed38,Icbc86b21
* changes:
  Add cc_prebuilt_library_headers
  Separate cc_library_headers to its own file and add tests
2020-02-25 04:05:16 +00:00
Treehugger Robot
a35e3ffd96 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." 2020-02-25 04:01:52 +00:00
Automerger Merge Worker
79cdcc07db Merge "Output json without trailing whitespaces but with trailing newlines." am: 65b5b59664
Change-Id: I4640dc70d62c51caa96c4e563866f35d125a7683
2020-02-25 00:41:28 +00:00
Treehugger Robot
65b5b59664 Merge "Output json without trailing whitespaces but with trailing newlines." 2020-02-25 00:39:23 +00:00
Automerger Merge Worker
ec3f52684e Merge "Require apps built against the SDK to use JNI built against the NDK" am: 48c2f294a6
Change-Id: I5f07647df61b60e70246fca49cff02f44d5a2dd6
2020-02-25 00:35:20 +00:00
Colin Cross
48c2f294a6 Merge "Require apps built against the SDK to use JNI built against the NDK" 2020-02-25 00:21:07 +00:00
Martin Stjernholm
37fa32ce94 Output json without trailing whitespaces but with trailing newlines.
Makes them more editor friendly, primarily when copied into
system/linkerconfig/testdata/root.

Test: m
Test: No diff between apex_manifest_full.json in out/
  and in linkerconfig/testdata/root/
Bug: 140599044
Change-Id: I6dacdd4baa59e6d70586c4a6343b9b8fd1b574f6
2020-02-24 22:20:49 +00:00
Colin Cross
897266ed5c Make filesToInstall return InstallPaths and add it to Module
Test: m checkbuild
Change-Id: I9170c7e22f000a2d0343e74a96079b24e8ad66f5
2020-02-24 15:51:27 +00:00
Colin Cross
609c49a389 Add pathForInstall and InstallPaths
pathForInstall will allow code in the android package to get paths
to the install directory.

InstallPaths provides helpers for handling lists of install paths.

Test: m checkbuild
Change-Id: I058201b205bc8bc67f3c1f62952aaaf758c47fd8
2020-02-24 15:51:18 +00:00
Paul Duffin
91756d2498 Add support for cc_library_headers in sdk/module_exports
Bug: 148933848
Test: m nothing
Change-Id: Ife6ee0f736238727a11b4421532eaeb29d46c1b7
2020-02-24 14:49:22 +00:00
Paul Duffin
a78f3a7360 Prune any empty property sets from the modules before transforming
Ensures that the generated prebuilt modules do not contain empty
property sets.

Bug: 148933848
Test: m nothing
Change-Id: I99d5da1c4e3a72836e81e021ef043df53888e66b
2020-02-24 14:49:22 +00:00
Paul Duffin
64f54b0ae8 Simplify cc library sdk snapshot handling of include dirs/headers
Previously, the code for generating a snapshot of a cc library was
split into two separate phases. The first phase copied the files that
needed copying and the second phase added the properties for the
include dirs. This separation made it difficult to make sure that the
two phases were in sync.

This change merges those two phases together so the same paths used to
copy the files are used in the properties ensuring consistency. As the
various type of include dir and header were treated slightly different
to each other this parameterizes that behavior.

Bug: 142935992
Test: m nothing
Change-Id: I7877464987bbdae9662e5e3f02bb5e5a75dca5a3
2020-02-24 14:49:22 +00:00
Paul Duffin
180a006a3b Add support for transforming a property set after its contents
This change adds support for transforming a property set after its
contents. This allows a transform to recursively prune empty property
sets that were created for a module.

The transformPropertySet method was renamed to
transformPropertySetBeforeContents and a new
transformPropertySetAfterContents method was added.

Bug: 148933848
Test: m nothing
Change-Id: Ia198d47e042b98c69406db4bc12859869816a387
2020-02-24 14:49:22 +00:00
Paul Duffin
047fdcac0f Fix issues with bp transformation
Returning nil from transformPropertySet in order to remove it did
not work because it ends up comparing as (*bpPropertySet, nil) and
not an untyped nil which causes the test against nil to fail.

This change adds tests to check that returning nil will delete a
property/property set from the containing property set and fixes the
code so that it passes the tests. It extracts common code to transform
a property set and its contents as well as code for creating new
property sets.

Bug: 148933848
Test: m nothing
Change-Id: I35dc3c39c76e701821891622615c09b094cf697f
2020-02-24 14:49:22 +00:00
Paul Duffin
f5ea9e1f76 Add cc_prebuilt_library_headers
In preparation for adding cc_library_headers support to
sdk/module_exports.

Two changes were needed to make the prebuilt version work.
1) Had to stop the prebuilt version of the library from creating static
   and shared variants for header only.
2) Had to allow the code to export/reexport include dirs to run even
   when no src is provided.

Bug: 148933848
Test: m nothing
Change-Id: Idd50ed38bc90d1d93551f78e6310f167941487d9
2020-02-24 14:49:22 +00:00
Paul Duffin
1c6c1c7251 Separate cc_library_headers to its own file and add tests
Preparation for adding cc_library_headers to sdk.

Bug: 148933848
Test: m nothing
Change-Id: Icbc86b21f44dc79393b82be339cf3b133cbf9d8c
2020-02-24 14:49:22 +00:00
Jiyong Park
00cae1cc88 Reland "Turn on the instrumentation by default for the java code in APEXes"
This reverts commit c021ea0b35.

Bug: 149353192
Change-Id: I2b1c0736202de26c5ea88c0ab14574bd7207a5fb
Test: N/A (this is a clean revert) forward fix will be followed
2020-02-24 15:59:21 +09:00