Commit Graph

5623 Commits

Author SHA1 Message Date
Pedro Loureiro
9537d594ce Merge "Update soong for new lint version" 2021-04-07 09:30:06 +00:00
Paul Duffin
b5933f64e4 Remove hidden API special handling of android.test.base
The android.test.base module should never be on the bootclasspath.

Bug: 184331423
Test: m droid
Change-Id: Ibb963b4ce2d915d0205fb1b5a7ca9159a5c99b3f
2021-04-07 10:06:31 +01:00
Paul Duffin
de21202bd2 Merge changes I45274836,I47268b81
* changes:
  Add PrebuiltNameFromSource
  Add IsModulePreferred
2021-04-07 09:04:18 +00:00
Treehugger Robot
47ded52960 Merge "Make lint HTML output deterministic" am: 27d220662f am: 49f37cda8a am: a93181a2a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665060

Change-Id: I35657730102d84c178a7f1792a2070ddd3023fcb
2021-04-07 01:19:43 +00:00
Treehugger Robot
a93181a2a6 Merge "Make lint HTML output deterministic" am: 27d220662f am: 49f37cda8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1665060

Change-Id: I654594507b7d26e8ef357c78b149fbe3bd606233
2021-04-07 00:32:15 +00:00
Treehugger Robot
27d220662f Merge "Make lint HTML output deterministic" 2021-04-06 23:14:10 +00:00
Paul Duffin
864116ce3f Add PrebuiltNameFromSource
Bug: 177892522
Test: m nothing
Change-Id: I45274836d59adbd6b2a2a848705b189398f1e766
2021-04-06 21:20:58 +01:00
Paul Duffin
e1d3837645 Add IsModulePreferred
Bug: 177892522
Test: m nothing
Change-Id: I47268b81359d6fceb60e899a730b3b6034e09814
2021-04-06 21:18:34 +01:00
Treehugger Robot
76e7452f48 Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs." am: 4238c5fe07 am: c952e7fad6 am: 855b5768cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657320

Change-Id: I4b500f3da2e6c39832ae4c93de6b4eb8667096d7
2021-04-06 19:55:03 +00:00
Treehugger Robot
855b5768cc Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs." am: 4238c5fe07 am: c952e7fad6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657320

Change-Id: Id9f34cbaf176160d68b31bf63e92c5144ecefea9
2021-04-06 19:29:20 +00:00
Treehugger Robot
4238c5fe07 Merge "Set the usesNonSdk manifest attribute whan targeting module SDKs." 2021-04-06 18:25:12 +00:00
Pedro Loureiro
70acc3dc0c Update soong for new lint version
Test: m nothing
Change-Id: Iaa9d37ef73f1fef5f2dbb8a840e774bb86c65bf7
2021-04-06 17:49:19 +00:00
Paul Duffin
aa73ae5b59 Update build to new location of hiddenapi config files
Bug: 179354495
Test: m nothing
Change-Id: I563237d46f35ae1d2b99ffaa93f77dfcef5a2b6e
2021-04-06 13:08:26 +01:00
Treehugger Robot
dd62393313 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 am: b17e061ae9 am: a7fe23c458
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: Ic1434fc150e802f3a6e8b58a9a6f3e16e93da146
2021-04-06 05:29:49 +00:00
Treehugger Robot
a7fe23c458 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 am: b17e061ae9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: I0128e2d5bf70a7cce8b16b78a62434c819b09de4
2021-04-06 04:42:35 +00:00
Treehugger Robot
8c56183fb7 Merge changes Id33bf640,I4d67b9b9
* changes:
  Don't use incorrect version names like VER or BOARD even in tests
  SdkSpec = Scope + ApiLevel
2021-04-06 03:18:16 +00:00
Colin Cross
ee4a8b7070 Make lint HTML output deterministic
Remove a date from the lint HTML output to make it deterministic.

Bug: 183509050
Test: m out/soong/.intermediates/packages/apps/DocumentsUI/DocumentsUI/android_common/lint/lint-report.html
Change-Id: I796c0b571780814b657b9427a17c248668053983
2021-04-05 18:38:05 -07:00
Colin Cross
713718317f Merge "Remove support for unsandboxed metalava" am: 7fef94f57b am: b60432e4c8 am: f9b5ed2b8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I8b624e1844d508121ad613110019d4478043657a
2021-04-06 01:33:50 +00:00
Colin Cross
f9b5ed2b8e Merge "Remove support for unsandboxed metalava" am: 7fef94f57b am: b60432e4c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I414edb7808f35e5db56edf6d1b0693cfe288b33d
2021-04-06 00:42:50 +00:00
Colin Cross
7fef94f57b Merge "Remove support for unsandboxed metalava" 2021-04-05 23:23:00 +00:00
Lorenzo Colitti
fa9b3f30fd Set the usesNonSdk manifest attribute whan targeting module SDKs.
From an ART perspective, calling module-lib APIs requires the
ability to bypass hiddenapi enforcement entirely. This CL ensures
that if an APK compiles against module-lib APIs, it will be able
to call those APIs. Currently, compiling against module-lib APIs
is not safe because APKs that are subject to hiddenapi protection
will crash at runtime.

Bug: 181309531
Test: made NetworkStackNext compile against module-current, and:
Test: aapt dump xmltree .../NetworkStackNext.apk AndroidManifest.xml | grep usesNonSdk
Change-Id: I5ca3328c64412078d803e0e3ffa1d8383602416f
2021-04-05 22:53:41 +09:00
Jiyong Park
54105c48f4 SdkSpec = Scope + ApiLevel
SdkSpec.Version was an int type. Now it becomes ApiLevel type which
is a better abstraction of the version (or api level).

Bug: 1655587
Test: m

Change-Id: I4d67b9b9eae45f653b6af4f5b73da9e091b3dfab
2021-04-05 09:32:06 +09:00
Jiyong Park
7f61ac4c8b Merge "Move java.sdkSpec to the android package" am: d4fa8fc107 am: 7ff95eca2f am: f19d2d57b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655587

Change-Id: I5c5d25a78c4f51876289dc450874d83c5a9c90b6
2021-04-03 13:16:03 +00:00
Jiyong Park
f19d2d57b3 Merge "Move java.sdkSpec to the android package" am: d4fa8fc107 am: 7ff95eca2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655587

Change-Id: I748c9c8d1eebacbd379121e32c54eff237ca0a80
2021-04-03 12:34:19 +00:00
Jiyong Park
f1691d2a2c Move java.sdkSpec to the android package
... in preparation for making the handling of sdk versions consistent
across java and cc modules.

Bug: 175678607
Test: m
Change-Id: I598f0454bce9b7320621022115412fbe97403945
2021-04-03 08:25:12 +09:00
Jaewoong Jung
89624d7866 Merge "Revert "Revert "Add min_sdk_version to java_import.""" am: d0afefa4b1 am: f7c8d8a746 am: 4377971d03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663082

Change-Id: I8090eb98d2f3eeb6be4413bfb774f6f30c66787b
2021-04-02 17:37:37 +00:00
Colin Cross
2e97711fe7 Merge "Silence kotlinc JDK9 warnings" am: 2fbc234fd6 am: 107c6aaef5 am: 17fd50923a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656462

Change-Id: I61a17cc185ea3a07a91db0d37f99d53792c77d3d
2021-04-02 17:37:18 +00:00
Jaewoong Jung
4377971d03 Merge "Revert "Revert "Add min_sdk_version to java_import.""" am: d0afefa4b1 am: f7c8d8a746
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663082

Change-Id: I42a5320bb4256b0d71e4060fb31ad01ac401dabb
2021-04-02 16:49:32 +00:00
Colin Cross
17fd50923a Merge "Silence kotlinc JDK9 warnings" am: 2fbc234fd6 am: 107c6aaef5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656462

Change-Id: Iedea65d318cbec535244763b9a67569dada26600
2021-04-02 16:49:11 +00:00
Jaewoong Jung
d0afefa4b1 Merge "Revert "Revert "Add min_sdk_version to java_import.""" 2021-04-02 15:49:58 +00:00
Colin Cross
2fbc234fd6 Merge "Silence kotlinc JDK9 warnings" 2021-04-02 15:39:13 +00:00
Jaewoong Jung
56e12dbbaf Revert "Revert "Add min_sdk_version to java_import.""
This reverts commit 5ab6508008.

Reason for revert: Resubmitting Ie255f74d40432f4bdd0092d618705a7d17235e58 after fixing the broken targets.

Bug: 183695497
Test: https://android-build.googleplex.com/builds/forrest/run/L58600000849810513
Change-Id: I5f072f396002ca3a45bd530ad9be987efa732833
2021-04-02 04:55:27 +00:00
Julien Desprez
573ad0da9f Merge "Remove tradefed static_lib heuristic" am: cb05715e9e am: d27a7fad3f am: 2781607d08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638101

Change-Id: I0b9f9615c0b3fd09c493728883d1b29ab8c8bafd
2021-04-02 04:50:38 +00:00
Julien Desprez
2781607d08 Merge "Remove tradefed static_lib heuristic" am: cb05715e9e am: d27a7fad3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638101

Change-Id: If068bf2977d8f202b013dbd408ba7192e10c8512
2021-04-02 04:45:45 +00:00
Julien Desprez
cb05715e9e Merge "Remove tradefed static_lib heuristic" 2021-04-02 03:47:13 +00:00
Jaewoong Jung
a8eae7b113 Merge "Revert "Add min_sdk_version to java_import."" am: 37a5d5ebd8 am: 7644361eef am: e790b69343
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663080

Change-Id: I8182c3f6caf58c0e96fc81b624ba974df68cc5bf
2021-04-02 02:40:39 +00:00
Jaewoong Jung
e790b69343 Merge "Revert "Add min_sdk_version to java_import."" am: 37a5d5ebd8 am: 7644361eef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663080

Change-Id: Id9a2c9d99d367d85ee2409d6f680f00dd567ca1e
2021-04-02 01:53:41 +00:00
Jaewoong Jung
37a5d5ebd8 Merge "Revert "Add min_sdk_version to java_import."" 2021-04-02 00:34:06 +00:00
Jaewoong Jung
5ab6508008 Revert "Add min_sdk_version to java_import."
This reverts commit 6d15d63556.

Reason for revert: Broke git_sc-mainline-prod on test_suites_x86_64

Fixes: 184305592
Change-Id: I4b2e2675e0dd9e2e84966f545a52f45d5b731bab
2021-04-02 00:17:59 +00:00
Jaewoong Jung
2745317d74 Merge "Add min_sdk_version to java_import." am: 51a0d85ebc am: e37f90021f am: f88946c3ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I81345ab4dd0efcc584d978db290361558fc6477c
2021-04-01 21:39:08 +00:00
Jaewoong Jung
f88946c3ac Merge "Add min_sdk_version to java_import." am: 51a0d85ebc am: e37f90021f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I60383180f51abf45cd68016a5ceef6900b96d5ab
2021-04-01 20:54:23 +00:00
Jaewoong Jung
51a0d85ebc Merge "Add min_sdk_version to java_import." 2021-04-01 19:45:53 +00:00
Paul Duffin
6909eacb78 Merge changes Idc01d3cc,I644db99c am: 379f36b6e5 am: 35bc45ceb4 am: 64b3d2adbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660144

Change-Id: I8b9120016d52200d6f9c7f1d3d92c84e02cdf5ee
2021-04-01 16:30:27 +00:00
Paul Duffin
64b3d2adbe Merge changes Idc01d3cc,I644db99c am: 379f36b6e5 am: 35bc45ceb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660144

Change-Id: I742f7dc058be2068c0a87037a60c0492959417b5
2021-04-01 15:47:32 +00:00
Paul Duffin
379f36b6e5 Merge changes Idc01d3cc,I644db99c
* changes:
  Remove FixturePreparer.Extend()
  Remove FixtureFactory
2021-04-01 14:34:02 +00:00
Paul Duffin
e10e1a7f03 Merge "Add a new platform_bootclasspath module type" am: 920e205e9d am: 4d662d84bd am: 5b58dd9070
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655612

Change-Id: If3d41887338a40bbe7d9414830345ead32e15b0b
2021-04-01 11:37:23 +00:00
Paul Duffin
5b58dd9070 Merge "Add a new platform_bootclasspath module type" am: 920e205e9d am: 4d662d84bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655612

Change-Id: Ic8d6a98c69dfd8a8fc384f2e2e4b2c144282c0c5
2021-04-01 10:50:22 +00:00
Paul Duffin
79abe57f53 Remove FixturePreparer.Extend()
Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Idc01d3cc5a57576a4cf417e9105d1ab851126e10
2021-04-01 10:33:20 +01:00
Paul Duffin
a713a8b987 Merge "Remove unused java testing methods" am: 4aa7faf487 am: 3971c45155 am: 9b05c66ed6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658077

Change-Id: I987d5981120069894f114a09fd29acf1830e0e02
2021-04-01 00:11:01 +00:00
Jaewoong Jung
6d15d63556 Add min_sdk_version to java_import.
Fixes: 183695497
Test: apex_test.go
Change-Id: Ie255f74d40432f4bdd0092d618705a7d17235e58
2021-03-31 16:50:42 -07:00