Commit Graph

945 Commits

Author SHA1 Message Date
Jiyong Park
403c255b6f Reland "mark platform un-availability""
This reverts commit 6e1fa4452b.

Reason for revert: relanding a reverted changed

Bug: 153073816
Change-Id: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c
Test: m
2020-05-04 11:12:00 +00:00
Jiyong Park
af4c62f78a Merge "Revert "mark platform un-availability"" 2020-05-04 10:58:24 +00:00
Jiyong Park
6e1fa4452b Revert "mark platform un-availability"
This reverts commit f9e67a8980.

Reason for revert: broke some targets

Exempt-From-Owner-Approval: reverting

Change-Id: I10af29b0fcf564dba0c3dbc1951b660b24fc58bb
2020-05-04 10:57:26 +00:00
Jiyong Park
f535e50ba2 Merge "mark platform un-availability" am: 8023018b0c am: 327107e3bd
Change-Id: I524c4c2c9130ac270234f1b73ac812f285c7ddf3
2020-05-04 10:34:30 +00:00
Jiyong Park
8023018b0c Merge "mark platform un-availability" 2020-05-04 10:10:24 +00:00
Ulyana Trafimovich
20a13769d9 Merge "Use two-column format for PRODUCT_BOOT_JARS components." am: 5f27aa4948 am: b0e411b030
Change-Id: I16fe462adf5cfcbbc8509fe0104a2c04d872f1c9
2020-05-04 09:08:11 +00:00
Bo Hu
4d6f4f6c9e emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
Merged-In: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-05-01 20:01:40 +00:00
Ulya Trafimovich
4c69c2ff72 Use two-column format for PRODUCT_BOOT_JARS components.
The first component is the apex name, or a special name "platform"
if the boot jar is a platform jar rather than a part of some apex.
This is a prerequisite change for moving core-icu4j to a separate
com.android.i18n apex.

Old one-column format is still supported, but all unqualified
components of PRODUCT_BOOT_JARS get "platform:" prepended to them
after reading the product makefiles.

Test: aosp_walleye-userdebug boots
Bug: 138994281
Change-Id: I0f79c7d10477880ca65354251a5d1ca0b7ce79ab
2020-04-30 17:16:29 +01:00
Dan Shi
737711d9dc [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
Merged-In: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-27 21:31:55 +00:00
Dan Shi
d7da773033 Merge "[VTS] copy ltp and kselftest to testcase folder" am: 6c04458129 am: fcaa097370
Change-Id: Id8758e59c828e8918907fe2d72aa5fb99ce61bca
2020-04-27 18:56:09 +00:00
Jiyong Park
f9e67a8980 mark platform un-availability
A module is marked unavailable for platform when 1) it does not have
"//apex_available:platform" in its apex_available property, or 2)
it depends on another module that is unavailable for platform.

In that case, LOCAL_NOT_AVAILABLE_FOR_PLATFORM is set to true for the
module in the Make world. Later, that flag is used to ensure that there
is no module with the flag is installed to the device.

The reason why this isn't entirely done in Soong is because Soong
doesn't know if a module will be installed to the device or not. To
explain this, let's have an example.

cc_test { name: "mytest", static_libs: ["libfoo"]}
cc_library_static { name: "libfoo", static_libs: ["libbar"]}
cc_library { name: "libbar", apex_available: ["com.android.xxx"]}

Here, libbar is not available for platform, but is used by libfoo which
is available for platform (apex_available defaults to
"//apex_available:platform"). libfoo is again depended on by mytest
which again is available for platform. The use of libbar should be
allowed in the context of test; we don't want to make libbar available
to platform just for the dependency from test because it will allow
non-test uses of the library as well.

Soong by itself can't tell whether libfoo and libbar are used only in the
context of a test. There could be another module depending them, e.g.,

cc_library_shared { name: "mylib", static_libs: ["libfoo"] }

can exist and it might be installed to the device, in which case
we really should trigger an error.

Since Make has the knowledge of what's installed and what's not,
the check should be done there.

Bug: 153073816
Test: m

Change-Id: I14ddf0e5700d0a7bf60e4e41536efbd26ab5ed3d
2020-04-27 08:46:41 +09:00
Treehugger Robot
5d979e29cf Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
Merged-In: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-24 21:52:47 +00:00
Dan Shi
7d1f8cec25 [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-24 14:49:25 -07:00
TreeHugger Robot
032c967caf Merge "Copy shared libraries used by tests in device-tests_host_shared-libs.zip." into rvc-dev 2020-04-20 00:28:06 +00:00
easoncylee
dde942ca88 Copy shared libraries used by tests in device-tests_host_shared-libs.zip.
This change collects the shared libraries files used by tests in
device-tests_host_shared-libs.zip. Then the host test can be run in
TradeFed host based on build artifacts.

Bug: 151172861
Test: m -j device-tests
Change-Id: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
Merged-In: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
2020-04-17 08:18:12 +08:00
Treehugger Robot
874a6827bc Merge "Remove phony target vts-core" am: 86cafc59d5 am: c56e6cefc0
Change-Id: I517d0cd69b2d82979fa2c7418d31b5e04b7d4200
2020-04-16 21:32:57 +00:00
Dan Shi
c581e59998 Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-16 11:45:56 -07:00
Dan Shi
5e7b3f429d Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
Merged-In: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-15 06:24:49 +00:00
Dan Shi
00490906ad Merge "Include shared host liraries in test suite zip" am: 3c4326f32f am: 34ca4231d5
Change-Id: Ifeb0f611ca81ac13016f3372f4c0c435b2c5884c
2020-04-14 23:56:36 +00:00
Dan Shi
6a619b8d85 Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-13 09:29:16 -07:00
Dan Shi
ff8a41c476 Rename vts-core to vts
Bug: 151896491
Test: local build
Change-Id: I17dc5cfeb0d47618201c58af0c9bdb1b7d0a1421
Merged-In: I17dc5cfeb0d47618201c58af0c9bdb1b7d0a1421
2020-04-06 20:28:31 +00:00
Bo Hu
f38abd4342 Merge "emulator: enable vendor boot image" am: ac74429171 am: e8966440c4
Change-Id: I69146442436f233b12989be15cb6f41a61a61450
2020-04-06 19:52:16 +00:00
bohu
8fd437c80a emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-04-06 14:05:28 +00:00
Dan Shi
afe347208a Merge "Rename vts-core to vts" am: 488d665d7d am: 4a07600e20
Change-Id: Ib75a89a887f20ecef78047391b5a648f462bff26
2020-04-03 23:24:39 +00:00
Dan Shi
155ffd4179 Rename vts-core to vts
Bug: 151896491
Test: local build
Change-Id: I17dc5cfeb0d47618201c58af0c9bdb1b7d0a1421
2020-04-01 13:07:15 -07:00
Daniel Norman
bb9a6493cc Merge "Adds the module from package-modules to ALL_MODULES." am: 63a16b56ee am: 5ed743860e
Change-Id: I22c956f1980a1496f376e93b68ddd6fcc3e60e02
2020-04-01 16:54:12 +00:00
Daniel Norman
63a16b56ee Merge "Adds the module from package-modules to ALL_MODULES." 2020-04-01 16:30:51 +00:00
Daniel Norman
1d18d5366e Adds the module from package-modules to ALL_MODULES.
This exposes any modules built with package-modules.mk to
module-info.json.

Test: refreshmod, inspect module-info.json and find new modules
      from platform_testing/build/tasks/*
Bug: 151670189
Change-Id: I8d502382640f4d49ab2c17fcc251e54720844b76
2020-03-31 16:49:39 -07:00
Dan Shi
60e8ff4d0d Merge "Rename VTS to VTS10" am: 916be61b91 am: ed51dee98e am: 474ebdd3e9 am: 371d7b5194
Bug: 151896491
Test: none

Change-Id: I6fc0004682299ac14d9d4f0e898eb9326812061f
Merged-In: I4ac161769068887e7575bb1f51a186a4efbe51d6
Merged-In: I6fc0004682299ac14d9d4f0e898eb9326812061f
(cherry picked from commit e8d9f8cd06)
2020-03-31 23:20:06 +00:00
Dan Shi
474ebdd3e9 Merge "Rename VTS to VTS10" am: 916be61b91 am: ed51dee98e
Change-Id: I4ac161769068887e7575bb1f51a186a4efbe51d6
2020-03-31 18:01:14 +00:00
Dan Shi
916be61b91 Merge "Rename VTS to VTS10" 2020-03-31 17:32:34 +00:00
Treehugger Robot
16a008d74d Merge "Copy shared libraries used by tests in device-tests_host_shared-libs.zip." am: 3f3351514c am: ab2cc75d0e
Change-Id: If7f96275eeb6e3b5006ba7c11eb6ab2f23e52662
2020-03-30 02:11:44 +00:00
Dan Shi
dec1d6e084 Rename VTS to VTS10
Bug: 151896491
Test: m -j vts10
Change-Id: I0a6468e63f381e67f34666975c18058d64048178
2020-03-28 13:28:21 -07:00
easoncylee
01e5ec2a21 Copy shared libraries used by tests in device-tests_host_shared-libs.zip.
This change collects the shared libraries files used by tests in
device-tests_host_shared-libs.zip. Then the host test can be run in
TradeFed host based on build artifacts.

Bug: 151172861
Test: m -j device-tests
Change-Id: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
2020-03-27 12:51:16 +08:00
Automerger Merge Worker
988e6b148f Merge "Package vts-tradefed.jar in general-tests" am: 04c90d44f7 am: 6ebc180650
Change-Id: Ib5323cb2df21a95f34558e73115e5d74dcf44555
2020-02-27 22:37:40 +00:00
Dan Shi
7edfb7f659 Package vts-tradefed.jar in general-tests
vts-core.xml imports some vts only preparer to run un-converted vts
python tests.

Bug: 149249068
Test: unittest
Change-Id: Ibdecb250f78c07d7645be4b140b8cfaeda99d79b
2020-02-19 15:22:11 -08:00
Automerger Merge Worker
5468683063 Merge changes from topic "vts-package" am: ab39096ee7 am: 3e052fc8e1 am: e74a22498c
Change-Id: I8a5edb9b725d9931a635d32f6ff58e632115f9e7
2020-02-19 22:45:06 +00:00
Automerger Merge Worker
9707307409 Change vts-core package to generic *ts package rule am: 4e143cdc85 am: ce62eaaabe am: 150e1c3511
Change-Id: Id09c4d3d0c1843574922819ca59ee91d741f624e
2020-02-19 22:45:03 +00:00
Dan Shi
5e06288e7c Add vts related artifacts to vts-core package
Bug: 149249068
Test: m -j vts-core
vts-core-tradefed run singleCommand vts-core -m VtsKernelLtp

Change-Id: I7fc25f83985bdf7bb34b29f7b28510ef0ade8e4b
2020-02-19 10:44:24 -08:00
Dan Shi
4e143cdc85 Change vts-core package to generic *ts package rule
The current package logic is based on general-tests and device-tests,
which have special rules to package test artifacts in a diffrent way.
vts-core suite should follow the generic *ts package rule.

Bug: 149249068
Test: m -j vts-core && vts-core-tradefed
run some vts-core test

Change-Id: Ib6ab7eb0fb4b8c898a0b3617d10be04dc98c2daa
2020-02-18 13:38:38 -08:00
Ulya Trafimovich
36101543e9 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
Merged-In: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
(cherry picked from commit 19ed3a0db7)
2020-02-13 13:36:11 +00:00
Ulyana Trafimovich
6780e0aaa1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 10:53:13 +00:00
Ulya Trafimovich
19ed3a0db7 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: walleye-userdebug boots

Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
2020-02-12 16:16:55 +00:00
Automerger Merge Worker
e0f40d1537 Merge "Implement vendor snapshot" am: 7decc032c2 am: 823e8030a8 am: 3e45e5f4d9
Change-Id: I996ca4a6c5f21c82eb375000f26c5834aa95f7b2
2020-02-11 00:27:28 +00:00
Dan Willemsen
277972a503 Default package-modules to strict module checks
Every warning has been fixed on master now.

Test: multiproduct_kati (build_test through treehugger)
Change-Id: I5bbbb3bd330422f976cb13d9078c5e192f135dc4
2020-01-30 11:03:12 -08:00
Inseob Kim
c465e20400 Implement vendor snapshot
Vendor snapshot can be captured with "m dist vendor-snapshot". With
vendor snapshot and vndk snapshot, older version of /vendor and newer
version of /system will be able to be built together by setting
BOARD_VNDK_VERSION to past vendor's version.

Only vendor modules under AOSP are to be captured. In detail, modules
under following directories are ignored:
- cts/
- device/
- external/clang/
- external/llvm/
- hardware/, except for:
    - interfaces/, libhardware/, libhardware_legacy/, ril/
- vendor/

Bug: 65377115
Test: m dist vendor-snapshot
Change-Id: Ib5859e409f8ab281ca137cae21e9ea08abd8a0b1
2020-01-23 21:51:08 +09:00
Automerger Merge Worker
9957c9bd22 Merge "Track addition of internal classes derived from OpenJDK 9+181." am: 48b67473c6 am: 664375d166 am: b5e0fb030a
Change-Id: I6e026a9e5cee48df98dec479de4d6a04e0e29e20
2020-01-17 22:15:26 +00:00
Treehugger Robot
48b67473c6 Merge "Track addition of internal classes derived from OpenJDK 9+181." 2020-01-17 16:41:48 +00:00
Tobias Thierer
c6cb1c3815 Track addition of internal classes derived from OpenJDK 9+181.
Bug: 147483640
Test: Treehugger

Change-Id: Ib934f0fe4e2aeadcc83bbae3c2efaf45a38081d4
2020-01-17 14:40:22 +00:00
Automerger Merge Worker
c6e9f75834 Merge "Add strict module check to package-modules.mk" am: 951ae30d56 am: a9d2208cb1 am: bc491a64a3
Change-Id: I3b5f49f2dfd2d7078a757d1a4c4fd743c00b3128
2020-01-17 00:31:00 +00:00