Commit graph

990 commits

Author SHA1 Message Date
Presubmit Automerger Backend
96c462ed29 [automerge] Initial STS sdk 2p: 5987bd823b 2p: afcd8ed66a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Bug: 238373261
Change-Id: Iecf9a88c03cbb75aae17ad41ee98a2e2e0dad5b8
2022-09-05 16:58:20 +00:00
Duy Truong
5987bd823b Initial STS sdk
Bug: 238373261
Test: m sts-sdk
Test: unzip sts-sdk.zip && tree -a
Test: echo 'sdk.dir=/home/duytruong/Android/Sdk' > local.properties && ./gradlew assemblestsarm

Change-Id: I7e7cf112d5fcd391169982a55e1d951a808b472d
2022-09-05 09:56:09 -07:00
Bob Badour
b5353a160b Fix license package name and provide license text.
Bug: 235331488

Test: m droid dist

Change-Id: Ic450732083773668bf9d9d0e1fffa1852f88ab45
Merged-in: Ic450732083773668bf9d9d0e1fffa1852f88ab45
2022-06-09 06:42:42 -07:00
Bob Badour
540a3f8ec1 Declare license metadata for copied files.
Bug: 151177513

Test: m droid dist reportmissinglicenses
Change-Id: Iada4a0ba3583f78e9419a5f487388b5e5eba195a
2022-04-20 13:01:35 -07:00
Sam Saccone
a24c755f66 Do not compress zip file for unit tests.
BUG=229404699

Change-Id: I91df8973b9308cd3fa572d7afe1e9e4ec8a9af39
2022-04-15 23:50:12 +00:00
Dan Shi
52cf004a37 Merge "Package vts kernel tests in general-tests.zip" 2022-04-15 05:03:20 +00:00
Bob Badour
b03c16badc Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I4ee8fd67ee30a3e21723e13642fdb89cd626a2dd
2022-04-12 18:57:15 -07:00
Dan Shi
dadf7ca475 Package vts kernel tests in general-tests.zip
Bug: 228204473
Test: m dist general-tests
Change-Id: Ic6dac4427f1cc2c3bbfdb6905936e2478e5a4350
2022-04-12 15:50:53 -07:00
Treehugger Robot
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
Bob Badour
3a0f0c157e Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: Ia7cddef9748f6c036a2fc7539dad717ebc131f7c
2022-04-07 22:03:29 -07:00
Yihan Dong
e45ff68740 Add additional license dependencies for VTS
Bug: 213388645
Test: m vts
Change-Id: I5f0b35b5ec943f5628f118bf0812391047b49708
2022-04-01 09:35:27 +00:00
Bob Badour
42f00c7b61 Test suite notices using dependencies.
Switch from combine-notice-files to html-notice-rule and
text-notice-rule.

Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m cts reportmissinglicenses
Change-Id: I59d78553f15f0fd6be87228c933693b63e2ebf04
2022-03-23 11:18:39 -07:00
yangbill
b2219c7052 Add supported variants to module-info
Export the list of variants (host, host_cross, device) a build module
supports to module-info for downstream tools. The values correspond to
the Soong `host_supported`, `host_cross_supported`, and `device_supported`
attribute values.

Bug: 220263783
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I10ae6ea21791d0d100686dcabecbce543a9adc3f
2022-02-25 01:28:51 +00:00
yangbill
e6b498bf2d Add data_bins to data_dependencies in module-info
This change exports the list of test_data_bins as data dependencies
that are required by modules when running the test.

Bug: 215234071
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Ie5c1ef70055618a5fa0ba1bcfbcba8054743d41a
2022-02-17 05:17:03 +00:00
yangbill
fa5026c4d8 Export runtime dependencies in module-info
This change exports the list of dependencies that are required by
modules at runtime. Note that only the host case is currently
handled.

Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I05199c54da311e59c7ea87595397ee4eecfab6a3
2022-02-10 08:07:13 +00:00
yangbill
724565d885 Export test data dependencies in module-info
Add the list of targets that are handled as data inputs and
required by tests at runtime.

Bug: 205726862
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Id1468ebaf8f72cf37787f3cc514a29724c115db5
2022-01-05 10:34:51 +08:00
yangbill
5f5e2362fa Add share_libs and system_share_libs to module-info
Bug: 202922558
Bug: 204269866
Test: m out/target/product/vsoc_x86_64/module-info.json

Change-Id: Idb4e66216cac4835968454f83196107f6bec4c1c
2021-11-01 06:38:43 +00:00
Jiakai Zhang
b6931f2f5b Add a build-time check for dexpreopting system server jars.
Bug: 201371822
Test: m nothing
Test: manual -
  1. Add "service-permission" to DEXPREOPT_DISABLED_MODULES (https://cs.android.com/android/platform/superproject/+/master:build/make/core/product_config.mk?q=DEXPREOPT_DISABLED_MODULES)
  2. m nothing
  3. See the error:
    Missing compilation artifacts. Dexpreopting is not working for some system server jars
    Offending entries:
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.odex
    system/framework/oat/x86_64/apex@com.android.permission@javalib@service-permission.jar@classes.vdex

Change-Id: If29b1c367e22e302f76bfbae29588e69536414b7
2021-10-29 11:56:49 +00:00
Treehugger Robot
30e367dbb4 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Change-Id: Ib15076b49fd207382fb18dfe554203ec13b2f126
2021-10-04 20:57:28 +00:00
Dan Shi
fd4802435c Allow compatibility suite also build a test list
The list of tests will be used to filter tests during test mapping run.

Bug: 201591516
Test: m dist cts vts
Change-Id: I2fd63b93c78af4fa88672aa903c87a4777691806
2021-10-04 11:41:06 -07:00
Yuntao Xu
272c630c5f Merge "move cts-test-coverage" am: 68be5b858c
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792

Change-Id: I99cf14fe6e7795ab5afbe6c29ce55e608352c64a
2021-09-17 23:27:11 +00:00
Yuntao Xu
2bf33c458f move cts-test-coverage
Moved cts-test-coverage from cts/build/ to build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts-test-coverage
Test: TreeHugger
Change-Id: I161adebc356b693329dfe48661476840c32beaa6
2021-09-16 11:55:08 -07:00
Yuntao Xu
34f50fefad Merge "Add android-cts-verifier.zip" am: a1b1f638d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673

Change-Id: Ib46b9e711faf8f663e1ba26a2e2ccf8d13b07f57
2021-09-16 17:22:44 +00:00
Yuntao Xu
26b9e3ba31 Add android-cts-verifier.zip
Adding android-cts-verifier.zip to $(HOST_OUT)/cts-verifier at
build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts
Test: TreeHugger
Change-Id: I63b2da75391221119025b597257c26906718cf77
Merged-In: I63b2da75391221119025b597257c26906718cf77
2021-09-15 18:04:04 -07:00
Yuntao Xu
3d4c52d6ed Merge "Add the cts-platform-version check" 2021-09-15 21:28:54 +00:00
Yuntao Xu
0f4f449343 Revert^2 "Add the cts-platform-version check"
712cf0a586

Change-Id: I5339a63a672ee2f09364bc8d2aee27d55c9305a6
Merged-In: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-09-15 17:31:40 +00:00
Yuntao Xu
712cf0a586 Revert "Add the cts-platform-version check"
Revert submission 15776724-rewrite cts-platform-version-check module

Reason for revert: merge conflicts with sc-dev-plus-aosp
Reverted Changes:
I7d018d2b3:Remove os/Android.mk
I613ac5b50:Add the cts-platform-version check

Change-Id: Ic4a9c58c46ffadb5fcaadd1649e54a9fa2a69285
2021-09-15 05:10:34 +00:00
Yuntao Xu
89c09d9ab9 Add the cts-platform-version check
Added the cts-platform-version check when the cts directory exists.

Bug: 194402596
Test: manually modified the ifeq condition to check error message
Test: TreeHugger
Change-Id: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
Merged-In: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-09-14 05:17:45 +00:00
Yuntao Xu
9c2fea67e9 Add the cts-platform-version check
Added the cts-platform-version check when the cts directory exists.

Bug: 194402596
Test: manually modified the ifeq condition to check error message
Test: TreeHugger
Change-Id: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-09-07 11:16:20 -07:00
Treehugger Robot
cefd2a4a97 Merge "Add missing custom kernel module targets" am: d5b993bac7
Original change: https://android-review.googlesource.com/c/platform/build/+/1809997

Change-Id: Iddab1746a6116a0af17c6baa5c064fd7f0d63296
2021-08-27 19:50:01 +00:00
Mark-PK Tsai
3ec61b4730 Add missing custom kernel module targets
Custom kernel module targets are not in the build dependency rule
which cause the copy command of $(my_copy_pairs) fail.
Add it back to $(my_image_copy_files) and remove the prefixed
$(my_staging_dir) from dest of kernel module copy pair.
Then the makefile can handle it well.

Bug: 195888474
Change-Id: Id8cb4c4991905e8bc53ddb5e60e87a36fe43e803
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-26 15:41:01 +08:00
Treehugger Robot
11d1759b32 Merge "Fix kernel module build of custom image" am: bb0d6a42d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1790067

Change-Id: I371275422da3fc1f5fe12b0bafba01af4e7fbca9
2021-08-18 21:40:17 +00:00
Sanket Chinchalkar
a6ce175958 Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939

Change-Id: Idfd099c87686e4ee3d19b2ee38606c62b1ad6522
2021-08-12 01:31:44 +00:00
Sanket Chinchalkar
ef0a516cc5 Report Performance Test Metrics as JSON File
Test: Tested Locally
Bug: 193722630
Change-Id: I113198050e4b0c5242785bc4bbee5fa95c19114d
2021-08-09 09:55:04 -07:00
Mark-PK Tsai
1024d6a17f Fix kernel module build of custom image
Correct the build-image-kernel-modules arguments then
the board can use BOARD_{CUSTOM_IMAGE}_KERNEL_MODULES
to install kernel modules.

Bug: 195888474
Change-Id: I65124acc470e7f6f701bf3c9f5481bb2d688d555
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-09 14:05:04 +08:00
Roland Levillain
632157c554 Merge "Add extra owners for file core/tasks/art-host-tests.mk." am: 7b763f0d46 am: bfc914edff
Original change: https://android-review.googlesource.com/c/platform/build/+/1780027

Change-Id: Ia1ab9f51cedd523e5536c25a87d9f5ef1549e873
2021-07-28 13:21:07 +00:00
Roland Levillain
7b763f0d46 Merge "Add extra owners for file core/tasks/art-host-tests.mk." 2021-07-28 12:51:01 +00:00
Roland Levillain
a83337de67 Merge "Work around art-host-tests build issues when using ART prebuilts." am: add7902aab am: 06704bd09f
Original change: https://android-review.googlesource.com/c/platform/build/+/1779476

Change-Id: If02fc30b815695bc473055db98c1a5c1bbd95930
2021-07-28 09:58:43 +00:00
Roland Levillain
49ec17eac8 Work around art-host-tests build issues when using ART prebuilts.
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

(cherry picked from commit 4d9d0aa86c)

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
Merged-In: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
2021-07-28 10:48:47 +01:00
Roland Levillain
6db8228316 Add extra owners for file core/tasks/art-host-tests.mk.
Test: build/make/tools/checkowners.py -c build/make/core/tasks/OWNERS
Bug: 169111770
Change-Id: I6dbbabd35386d806a786e1d895070bb2c19fa2c6
2021-07-28 10:21:56 +01:00
Roland Levillain
4d9d0aa86c Work around art-host-tests build issues when using ART prebuilts.
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
2021-07-27 15:00:48 +01:00
Bill Peckham
315b98a73a Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
(cherry picked from commit 0a30cc41bc)
2021-06-16 19:54:07 +00:00
Bill Peckham
16da01fe20 Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Merged-In: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
2021-06-16 09:10:07 -07:00
jschung
904e1735c8 Include android-gts/lib folder in android-gts.zip
Some gts tests such as JniUncompressGtsTestCases need native libraries
and those should be located under android-gts/lib.

Test: confirmed that the android-gts.zip includes lib folder
Bug: 186595833
Change-Id: I7d0605d0aff861059e3788630585e9ba412f9cac
2021-04-29 16:32:47 +09:00
Treehugger Robot
b61e627bf1 Merge "Build module-info.json in dist" am: 9657a54894 am: a0ece52b29 am: b20d39573b
Original change: https://android-review.googlesource.com/c/platform/build/+/1648028

Change-Id: I15d16f350c40ad2d3d348be2c72ac8cc954c8658
2021-03-23 12:52:28 +00:00
easoncylee
330af541eb Build module-info.json in dist
This is needed for test mapping to have module-info.json built out for
device targets so that test harness can do some checks to ensure the
test is properly configured in TEST_MAPPING files.

module-info has alreay depended on droidcore, which will be
built out in the infrastructure.

Verified in a forrest run: https://android-build.googleplex.com/builds/forrest/run/L81000000840964024

Bug: 154931418
Test: m -j droidcore
      m -j module-info
Change-Id: I76b97debe3fbd51c2dc033c91ed9c2eb73cfa8a2
2021-03-22 10:33:36 +00:00
Treehugger Robot
729b3f13f3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: e4adbd3306 am: de36af49d7 am: cc44f061cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1627682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38f06dc1c725fb244d911bf83091e01d3899b947
2021-03-11 12:01:21 +00:00
Bob Badour
a8cf0e040e [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  core/tasks/tools/package-modules.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m nothing

Exempt-From-Owner-Approval: janitorial work
Change-Id: I751a3d65c9791c5397e1bcdb89342c0b61647411
2021-03-10 23:31:03 -08:00
Treehugger Robot
1159836191 Merge "Remove LOCAL_LICENSE_KINDS from core makefiles." am: 6d89e4a9e1 am: 4e65e3d319 am: 865bab3587
Original change: https://android-review.googlesource.com/c/platform/build/+/1589812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48b430e1e35507a2e09320321da4f625db2a0e00
2021-02-16 19:02:42 +00:00
Bob Badour
17831e3da3 Remove LOCAL_LICENSE_KINDS from core makefiles.
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I4deec3e07862e89dd32880774efb4624a9723cf2
2021-02-16 04:37:23 -08:00