Commit Graph

4334 Commits

Author SHA1 Message Date
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
Paul Duffin
9b05c66ed6 Merge "Remove unused java testing methods" am: 4aa7faf487 am: 3971c45155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658077

Change-Id: Ie437167d5e6a58fa4457729170e57f677ff0ccfc
2021-03-31 23:23:10 +00:00
Paul Duffin
bb7f1ac794 Add a new platform_bootclasspath module type
Initially, this is just a placeholder but functionality will be added
in follow up changes.

Bug: 177892522
Test: m nothing
Change-Id: I890b0d5a117c51a19c9ac5df98c766761d3aa16c
2021-03-31 22:44:34 +01:00
Paul Duffin
4aa7faf487 Merge "Remove unused java testing methods" 2021-03-31 21:41:42 +00:00
Paul Duffin
450157f5d6 Merge "Remove varargs from RunTest(t *testing.T)" am: 5086512524 am: f199bedb2d am: c29b3dd043
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658078

Change-Id: Id84553d18b818cc8f3fba596a5c230551416d73e
2021-03-31 18:34:07 +00:00
Paul Duffin
c29b3dd043 Merge "Remove varargs from RunTest(t *testing.T)" am: 5086512524 am: f199bedb2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658078

Change-Id: Ie5e8aae83feeb2e07bb5906de82536bd50171ce3
2021-03-31 18:27:29 +00:00
Paul Duffin
535e0a105e Remove unused java testing methods
Also, stops exporting methods that are no longer used outside the java
package.

Bug: 181070625
Test: m nothing
Change-Id: I23d35bbc21f82f2dae802aa53badda4c58b41024
2021-03-31 16:20:12 +01:00
Paul Duffin
55e740e9a6 Remove varargs from RunTest(t *testing.T)
Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Iaedb0ddc9d6a704f4d41363e705f3025a1291dc8
2021-03-31 16:03:59 +01:00
Colin Cross
ae012ff969 Merge "Default metalava sandboxing to true" am: 8b6378b0dc am: 0d6a3af0f7 am: 3fc612ce15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654170

Change-Id: I53720a775034e7b6cc6730e4faa14fedc5b9cfca
2021-03-31 01:20:28 +00:00
Colin Cross
3fc612ce15 Merge "Default metalava sandboxing to true" am: 8b6378b0dc am: 0d6a3af0f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654170

Change-Id: Ibcc9359a4d1d447df72694224717c4a5e7a337ae
2021-03-31 00:55:23 +00:00
Paul Duffin
49e0d8b637 Merge "Remove extraneous calls to TestingBuildParams.RelativeToTop()" am: dff50dffbc am: c9ec211cca am: 31638bfb46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655209

Change-Id: I8cac59260ab0d3f5c4ffe4cb6629c76105cf50ca
2021-03-31 00:21:41 +00:00
Colin Cross
a3c3ba8605 Merge changes I866850b3,I9022d17b am: ff1c8c49c0 am: d39b826a04 am: c7587234fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656461

Change-Id: I32f631bf90e2a30adaedd6a25cfa97a0dfbc2fae
2021-03-31 00:20:57 +00:00
Paul Duffin
31638bfb46 Merge "Remove extraneous calls to TestingBuildParams.RelativeToTop()" am: dff50dffbc am: c9ec211cca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655209

Change-Id: I37b829e1b74a249bba86bfdcaba791c471506af9
2021-03-30 23:31:06 +00:00
Colin Cross
8b6378b0dc Merge "Default metalava sandboxing to true" 2021-03-30 23:30:51 +00:00
Colin Cross
c7587234fb Merge changes I866850b3,I9022d17b am: ff1c8c49c0 am: d39b826a04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656461

Change-Id: Ia6520093dc8a10a42d932943e133153e9bd3a651
2021-03-30 23:30:47 +00:00
Paul Duffin
b4c0f11cb7 Automatically call TestingBuildParams.RelativeToTop() am: e8366da1f6 am: fe53b7a2df am: 53325362e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655208

Change-Id: I2260f4020c4631310626f77ec7480f106e4c7c3b
2021-03-30 23:14:01 +00:00
Paul Duffin
dff50dffbc Merge "Remove extraneous calls to TestingBuildParams.RelativeToTop()" 2021-03-30 23:09:52 +00:00
Colin Cross
ff1c8c49c0 Merge changes I866850b3,I9022d17b
* changes:
  Add dependencies for Metalava's implicit android.jar references
  Support sandboxing droiddoc and droidstubs with args properties
2021-03-30 21:54:51 +00:00
Paul Duffin
53325362e9 Automatically call TestingBuildParams.RelativeToTop() am: e8366da1f6 am: fe53b7a2df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655208

Change-Id: Ied3672ee9454a74a6b4d0169ea59898baf23b3cd
2021-03-30 21:44:07 +00:00
Paul Duffin
a71a67a4f5 Remove extraneous calls to TestingBuildParams.RelativeToTop()
Deprecated the method to try and prevent any other uses being added.

Bug: 183650682
Test: m nothing
Change-Id: Ia6f43851e5a00c9d96af780e3bd21e03175e1a2f
2021-03-30 20:03:22 +01:00
Paul Duffin
e8366da1f6 Automatically call TestingBuildParams.RelativeToTop()
Fixes the few tests that break due to this and which cannot easily be
separated into their own changes.

Bug: 183650682
Test: m nothing
Change-Id: Ia2f31213a1f114a78e66a81d89279ecde9f4c465
2021-03-30 19:35:35 +01:00
Paul Duffin
ef17c94085 Merge "Migrate system_modules_test.go from NormalizePathsForTesting" am: 87d3bae657 am: 41ded6e7da am: b90f91e43f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654684

Change-Id: Ie6d613536371e18f06a8b59e6659a74af58f84ae
2021-03-30 18:32:17 +00:00
Paul Duffin
b19122a9f6 Merge "Add the transitive dependencies of boot_image to apex" am: 58367574a5 am: 023bd16632 am: 9b7d7f45f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652623

Change-Id: Id3cc4bc9ecaaa4ae789e7d79ebce575f9760bdda
2021-03-30 18:32:11 +00:00
Paul Duffin
a230ea4687 Merge "Add contents property to boot_image (and prebuilt_boot_image)" am: 8d3c44a986 am: b8f0b4e1bf am: af5736ea92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652622

Change-Id: Idb92c709d8bf17e3e00905ea54b9ee2bc901bbac
2021-03-30 18:31:51 +00:00
Paul Duffin
b90f91e43f Merge "Migrate system_modules_test.go from NormalizePathsForTesting" am: 87d3bae657 am: 41ded6e7da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654684

Change-Id: Ifc8b29510a047b2efb4db78198e46f64449177b7
2021-03-30 18:02:41 +00:00
Paul Duffin
9b7d7f45f0 Merge "Add the transitive dependencies of boot_image to apex" am: 58367574a5 am: 023bd16632
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652623

Change-Id: Id6087a6d975ed2a9480141ff693f21e1355f8364
2021-03-30 18:02:29 +00:00
Paul Duffin
af5736ea92 Merge "Add contents property to boot_image (and prebuilt_boot_image)" am: 8d3c44a986 am: b8f0b4e1bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652622

Change-Id: Ic8c97eb640ca5d6dc0de0a8ac08391ed73bc0a0a
2021-03-30 17:44:23 +00:00
Paul Duffin
87d3bae657 Merge "Migrate system_modules_test.go from NormalizePathsForTesting" 2021-03-30 16:42:55 +00:00
Paul Duffin
58367574a5 Merge "Add the transitive dependencies of boot_image to apex" 2021-03-30 16:42:07 +00:00
Paul Duffin
8d3c44a986 Merge "Add contents property to boot_image (and prebuilt_boot_image)" 2021-03-30 16:26:20 +00:00
Colin Cross
3fbf2bea6a Default metalava sandboxing to true
Turn on sandboxing everywhere.

Bug: 153703940
Test: m checkbuild
Change-Id: Ie64913d302efb780d5be9c1b32e6c368d72feba3
2021-03-29 21:57:49 -07:00
Colin Cross
5f6ffc72f7 Add dependencies for Metalava's implicit android.jar references
Metalava implicitly searches
prebuilts/tools/common/api-versions/android-%/android.jar and
prebuilts/sdk/%/public/android.jar when looking for --android-jar-patterns
matches, and fails if it can't find a match for an API level between 1 and
28 in at least one pattern.  Add android.jar files from the
api_levels_annotations_dirs directories to try to satisfy these patterns.

Bug: 153703940
Test: m docs
Change-Id: I866850b33d9a5cd82cc5135bd8f9e9400ed65439
2021-03-29 21:57:49 -07:00
Paul Duffin
c434921028 Merge "Add dependencies for art boot_image" am: 16e6aeeb51 am: d019752f73 am: 78dd45f054
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652451

Change-Id: If37ae085694aa93924dce1548fad89b05fdfd8b0
2021-03-29 22:07:06 +00:00
Paul Duffin
78dd45f054 Merge "Add dependencies for art boot_image" am: 16e6aeeb51 am: d019752f73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652451

Change-Id: Icf9a9823a7afb88ed96a0cd8aff0b43d983770ab
2021-03-29 21:39:57 +00:00
Paul Duffin
16e6aeeb51 Merge "Add dependencies for art boot_image" 2021-03-29 20:27:12 +00:00
Ulyana Trafimovich
f48877b046 Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: f682410cbf am: 1012c230b2 am: 42983b7316
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655690

Change-Id: Iea739178209de07d66eeab82794392d0ff378743
2021-03-29 18:26:54 +00:00