Commit Graph

13246 Commits

Author SHA1 Message Date
Colin Cross
53f0fd2cc3 Merge "Support target.hostdex.required" am: 226586ca3c
am: 02a9b1af2c

Change-Id: Id2ad67edd62f10446e7786241b0518091239ab42
2019-04-24 17:31:15 -07:00
Colin Cross
02a9b1af2c Merge "Support target.hostdex.required"
am: 226586ca3c

Change-Id: I044fa3272c81ffd894be6a59ed7b1d60d6743973
2019-04-24 17:20:24 -07:00
Colin Cross
226586ca3c Merge "Support target.hostdex.required" 2019-04-25 00:06:00 +00:00
Colin Cross
bf88157691 Make java_test_helper_library installable am: 9a4abed701
am: 3109e125b3

Change-Id: I7d587db7e3cd8a4d23e653b7295d62d7a9cdb740
2019-04-24 15:55:03 -07:00
Colin Cross
4d002bafd2 Export proguard_dictionary for java_library modules am: e8a7dc987c
am: 5452d26838

Change-Id: I991eddb63cf66016bcfc3270ee876f0cdfe7cd99
2019-04-24 15:51:55 -07:00
Colin Cross
3109e125b3 Make java_test_helper_library installable
am: 9a4abed701

Change-Id: I082ee7deec7677e9a00b5511ee650dba512c5485
2019-04-24 15:47:48 -07:00
Colin Cross
5452d26838 Export proguard_dictionary for java_library modules
am: e8a7dc987c

Change-Id: I62eb5f457aa2aa8f90f7d46e872f2136e8a39150
2019-04-24 15:45:47 -07:00
Colin Cross
7f87f4fdeb Support target.hostdex.required
Hostdex modules sometimes need extra required modules, add
target.hostdex.required.

Bug: 131167818
Test: manual
Change-Id: I599f3499f0b738556baeb27185371a42b4c2701b
2019-04-24 20:43:14 +00:00
Colin Cross
9a4abed701 Make java_test_helper_library installable
java_test_helper_library should product an installabler, dexed
library, the same as java_test just without the auto-generated
test config.

Test: m checkbuild
Change-Id: Ie573c1d24969ba9c4feb8a2e85f8969d5d713064
2019-04-24 13:19:28 -07:00
Colin Cross
e8a7dc987c Export proguard_dictionary for java_library modules
Move exporting LOCAL_SOONG_PROGUARD_DICT from AndroidLibrary
to Library so that it is exported for java_library modules.

Test: m checkbuild
Change-Id: I27ea08ad8ba9072d0648c141cdbaf447c5268f91
2019-04-24 12:52:42 -07:00
Colin Cross
4192aa50e9 Export java_host_for_device and java_device_for_host modules to Make am: 28c3eb6829
am: 0872753d91

Change-Id: Ifffaa4dd1d2943deedfb2080d1bc3386c0080eaf
2019-04-24 10:35:17 -07:00
Colin Cross
0872753d91 Export java_host_for_device and java_device_for_host modules to Make
am: 28c3eb6829

Change-Id: I3cbb222c85048b087b10463ec4ae589ba387317e
2019-04-24 10:30:12 -07:00
Colin Cross
28c3eb6829 Export java_host_for_device and java_device_for_host modules to Make
Robolectric needs to reference some modules declared with
java_host_for_device and java_device_for_host from Make for now.

Bug: 122331577
Test: m checkbuild
Change-Id: I09b3848edb120f2c3ee16b449b937b650f59811b
2019-04-24 05:17:22 +00:00
Jiyong Park
ded02fab27 Merge "Prebuilt APEXes are recoreded in apexkeys.txt" into qt-dev
am: a25a2779c6

Change-Id: Ia6f97ecf118b6a74f68ddc6c69ece35ee8fe934d
2019-04-23 21:42:24 -07:00
Colin Cross
9901de43b4 [automerger skipped] Merge "Fix handling optimize.enabled from java_defaults" into qt-dev
am: 687fd94d44 -s ours
am skip reason: change_id Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c with SHA1 2057f82161 is in history

Change-Id: Ic5b7f2af7ae6305a55b6af5dfefc0eb9e08a36f6
2019-04-23 21:06:59 -07:00
TreeHugger Robot
a25a2779c6 Merge "Prebuilt APEXes are recoreded in apexkeys.txt" into qt-dev 2019-04-24 03:46:16 +00:00
Colin Cross
687fd94d44 Merge "Fix handling optimize.enabled from java_defaults" into qt-dev 2019-04-24 03:31:49 +00:00
Jaewoong Jung
f80055138e Merge "New AndroidMk authoring system based on entry map." am: 159a585251
am: 7cf4b87560

Change-Id: I2b9e70d207146ba5a4d2c04489cc680b6f9d0d6f
2019-04-23 09:31:18 -07:00
Jaewoong Jung
7cf4b87560 Merge "New AndroidMk authoring system based on entry map."
am: 159a585251

Change-Id: Iaea12a1314d12e724145dc8c3698390d33e623aa
2019-04-23 09:07:27 -07:00
Jaewoong Jung
159a585251 Merge "New AndroidMk authoring system based on entry map." 2019-04-23 14:43:52 +00:00
Jiyong Park
a41f12a6fa Prebuilt APEXes are recoreded in apexkeys.txt
apexkeys.txt now correctly lists prebuilt APEXes with keys specified as
PRESIGNED.

This change also fixes a bug that non-installable APEXes are listed in
the file.

Bug: 131130235
Test: m out/soong/apexkeys.txt and check that
com.android.apex.cts.shim.apex is listed there with PRESIGNED keys.

Change-Id: Ib6d391a82864714743a1cc59cd655bea917b5073
2019-04-23 18:03:16 +09:00
Jiyong Park
1044ef7d90 [automerger skipped] Merge changes Ic5f467fb,I68d52668 into qt-dev
am: 6decc5d7ff -s ours
am skip reason: change_id Ic5f467fbc2837727df92102530687e967cd5529f with SHA1 d4671111ef is in history

Change-Id: I06ba3afa9d43488afceb1eb71c542b32a3a0717b
2019-04-22 23:39:50 -07:00
Jiyong Park
7a0300d1df [automerger skipped] Set default target SDK version for APEX
am: d37a882ad4 -s ours
am skip reason: change_id I086230d787f01075c28fc3f0163550300fa00212 with SHA1 71b519d6ce is in history

Change-Id: I654ce369c3fb952d97647e630476d603ba6fd1dc
2019-04-22 23:38:56 -07:00
TreeHugger Robot
6decc5d7ff Merge changes Ic5f467fb,I68d52668 into qt-dev
* changes:
  Ensure that PathsForModuleSrc works with prebuilts
  Fix: PathsForModuleSrc does not work for a replaced dependency
2019-04-23 06:24:22 +00:00
Jiyong Park
d37a882ad4 Set default target SDK version for APEX
Target SDK version is used for targeting an APEX to a specific set of
platform builds. Usually, the targeting is unrestricted (in case the
APEX can run on all platforms), or based on platform SDK version (e.g.
28 for P). However, when the platform is under development and SDK is
not finalized, the targeting should be much more fine-grained; the
APEX should be targeted to a very specific build that supports the same
set of APIs that the APEX was built against.

To support that, target sdk version is automatically set by the build
system. When the platform is released or SDK is finalized, the target sdk
version set to the SDK version number. If not, it is set to
<version_code>.<fingerprint> (e.g., Q.123456).
Note that the target sdk version set by the build system is used only
when the target sdk version is not explicitly set in
AndroidManifest.xml.

Bug: 130541924
Test: UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true \
TARGET_BUILD_APPS=com.android.tzdata m
build.ninja has --target_sdk_version Q.$$(cat out/soong/api_fingerprint.txt)

Test: aapt dump badging out/dist/com.android.tzdata.apex | grep \
targetSdkVersion shows:
targetSdkVersion:'Q.6ee443d9ad5f0cca7a43cfa97b7fc62a'

Merged-In: I086230d787f01075c28fc3f0163550300fa00212
Change-Id: I086230d787f01075c28fc3f0163550300fa00212
(cherry picked from commit 71b519d6ce)
2019-04-23 14:26:06 +09:00
Colin Cross
3533a273fa Merge "Fix tests with cc_binary_host on mac" am: 588c1ee5f8
am: 34f52a3894

Change-Id: I868f475487e3b0b761ba2c1f7b160751365372d4
2019-04-22 21:26:51 -07:00
Colin Cross
34f52a3894 Merge "Fix tests with cc_binary_host on mac"
am: 588c1ee5f8

Change-Id: Ib708699fa03549edc180e038890b1262ca7476dc
2019-04-22 21:22:50 -07:00
Treehugger Robot
588c1ee5f8 Merge "Fix tests with cc_binary_host on mac" 2019-04-23 04:12:26 +00:00
Dan Willemsen
7d155094be Merge "pom2bp: Implement -static-deps to match pom2mk" am: 80ae6816ae
am: 9181e08738

Change-Id: I331a7bb1cd82315f673d9007c2240da423864034
2019-04-22 20:17:35 -07:00
Dan Willemsen
9181e08738 Merge "pom2bp: Implement -static-deps to match pom2mk"
am: 80ae6816ae

Change-Id: I3929fd5ba1830048f56ba99e98ca246dedb7a1af
2019-04-22 20:12:29 -07:00
Treehugger Robot
80ae6816ae Merge "pom2bp: Implement -static-deps to match pom2mk" 2019-04-23 02:55:26 +00:00
Jiyong Park
725cb5442d Merge "Set default target SDK version for APEX" am: 6fa6dfa25d
am: 83b88315f7

Change-Id: I3d6dcbaf1c7aa38ce6c7a1a57e35355edf94ff54
2019-04-22 17:36:55 -07:00
Jiyong Park
83b88315f7 Merge "Set default target SDK version for APEX"
am: 6fa6dfa25d

Change-Id: I87619df41d8c83b44f102c50fb2c7e1e6bdc6e34
2019-04-22 17:30:02 -07:00
Colin Cross
cec018e08d [automerger skipped] Merge changes from topic "framework.aidl" into qt-dev
am: efcdd3b4bd -s ours
am skip reason: change_id I4e3b1274cc32038b00b292dc6d67559eb320e9e4 with SHA1 5c87791a78 is in history

Change-Id: I8cfd2986bcb726b18180b0f07e5abf395c3e0493
2019-04-22 17:20:19 -07:00
Treehugger Robot
6fa6dfa25d Merge "Set default target SDK version for APEX" 2019-04-23 00:18:54 +00:00
Colin Cross
79888fe956 [automerger skipped] Allow codename.fingerprint format for targetSdkVersion
am: 5c87791a78 -s ours
am skip reason: change_id I4e3b1274cc32038b00b292dc6d67559eb320e9e4 with SHA1 109328714f is in history

Change-Id: I5d0c0e8c61cff2c1d2535f75028967c27e708392
2019-04-22 17:10:53 -07:00
Colin Cross
efcdd3b4bd Merge changes from topic "framework.aidl" into qt-dev
* changes:
  Allow codename.fingerprint format for targetSdkVersion
  Build framework.aidl in Soong
  Get default sdk_test.go values from config
2019-04-22 23:26:55 +00:00
Colin Cross
9c6241f768 Fix tests with cc_binary_host on mac
cc_binary_host on mac uses ctx.Config().HostSystemTool(), which needs
PATH in the test environment.  Copy it from the original environment.

Fixes: 129763458
Test: proto_test.go
Change-Id: I41c1acdceee7c35036148256adafb471871034df
2019-04-22 15:55:56 -07:00
Jaewoong Jung
9aa3ab1f3f New AndroidMk authoring system based on entry map.
The new system collects all Android.mk variable assignments using a map
and writes them to io.Writer. Compared to the previous system, which
directly writes all entries to buffers, this new system is more robust
and test-friendly.

Test: Built without prebuilt_etc.go change and diffed the mk output.
Test: prebuilt_etc_test.go
Change-Id: Idd28443d129ff70053295015e69328a8fa3eca47
2019-04-22 15:32:44 -07:00
Colin Cross
baba66ca1a [automerger skipped] Fix relative path of bpf modules
am: a3f279bd1b -s ours
am skip reason: change_id Ifdae90d11b15d65c097562d7d6985a8a1dca2bfd with SHA1 0adfee5a20 is in history

Change-Id: I5fee99fee9fef72bdfa4496293f0644b61884926
2019-04-22 15:02:44 -07:00
Sasha Smundak
4eaeab4442 Fix handling optimize.enabled from java_defaults
Some module types (`android_test`, etc.) set `optimize.enabled` by
default. If such module happens to have `defaults` attribute which
clears `optimize.enabled`, the latter value is ignored.

Fixes: 129858282
Test: unit tests in java_test.go,
`atest CtsExtendedMockingTestCases` succeeds with aog/936802
reverted (that is, with cts/test/mocking converted to Android.bp)

Change-Id: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c
Merged-In: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c
(cherry picked from commit 2057f82161)
2019-04-22 10:46:51 -07:00
Colin Cross
a3f279bd1b Fix relative path of bpf modules
Using bpf as test data installs the module into a strange
subdirectory, clear the Rel() value before exporting it as
a SourceFileProducer.

Bug: 130206035
Test: m vts_test_binary_bpf_module
Change-Id: Ifdae90d11b15d65c097562d7d6985a8a1dca2bfd
Merged-In: Ifdae90d11b15d65c097562d7d6985a8a1dca2bfd
(cherry picked from commit 0adfee5a20)
2019-04-22 17:42:23 +00:00
Colin Cross
6479beeca0 Merge "Allow codename.fingerprint format for targetSdkVersion" am: e928452f30
am: 1a385d14ef

Change-Id: Ib5d0bb3b6501a3b1565a13d21c57cf5e1a601a03
2019-04-22 10:09:41 -07:00
Colin Cross
5c87791a78 Allow codename.fingerprint format for targetSdkVersion
Use codename.fingerprint format for targetSdkVersion if it is unset
in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true.

Test: manual
Bug: 130541924
Change-Id: I4e3b1274cc32038b00b292dc6d67559eb320e9e4
Merged-In: I4e3b1274cc32038b00b292dc6d67559eb320e9e4
(cherry picked from commit 109328714f)
2019-04-22 10:08:35 -07:00
Colin Cross
9bdfaf0591 Build framework.aidl in Soong
Move the rules to build framework.aidl into Soong, and use it
when compiling aidl files with sdk_version: "current".

Also fixes incorrectly using the aidl includes exported by the
"framework" module when the proguardRaiseDep dependency was
added.

Bug: 130798034
Test: sdk_test.go
Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
Merged-In: I126adf1d9e7b6acb528875ff62b974ba7ad9a337
(cherry picked from commit 3047fa23da)
2019-04-22 10:08:35 -07:00
Colin Cross
31174703be Get default sdk_test.go values from config
This will help avoid merge conflicts between branches that have
additional default libraries.

Bug: 130798034
Test: sdk_test.go
Change-Id: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
Merged-In: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
(cherry picked from commit 901ea31b7c)
2019-04-22 10:08:17 -07:00
Colin Cross
1a385d14ef Merge "Allow codename.fingerprint format for targetSdkVersion"
am: e928452f30

Change-Id: I474891969735933f98c3a09646c50efca57efff8
2019-04-22 10:04:30 -07:00
Colin Cross
e928452f30 Merge "Allow codename.fingerprint format for targetSdkVersion" 2019-04-22 16:48:35 +00:00
Dan Willemsen
52c90d868e pom2bp: Implement -static-deps to match pom2mk
This changes the default behavior of pom2bp to match pom2mk, and not
require pre-extraction of all of the manifests.

Test: convert an internal pom2mk user to pom2bp
Change-Id: I08120cce1f923ef28519563ffd772032b2e500ed
2019-04-21 21:46:42 -07:00
Colin Cross
19b9e855c9 Merge "Build framework.aidl in Soong" am: 8bf9bd9f91
am: 2e2967423a

Change-Id: I177c278e520177929aeb76fc1ce6f05ebc576a20
2019-04-21 10:38:53 -07:00