Commit Graph

587 Commits

Author SHA1 Message Date
bohu a83fc0e482 emulator: fix a typo when copying userdata.img
replaced TARGET_CPU_ADI with TARGET_CPU_ABI

BUG: 110492064

this cl does not impact real devices

Test:
nohup make -j100 ANDROID_USE_BUILDCACHE=false PRODUCT-sdk_gphone_x86-sdk_addon showcommands dist DIST_DIR=${PWD}/dist/x86 sdk_repo
unzip the image package sdk-repo-linux-system-images-eng.zip and  make sure userdata.img is inside

Change-Id: I24101c78d789c9b72132efc41a2e98d5274b5ff1
2018-06-25 15:33:14 -07:00
Weilun Du 2276fb95cf Copy dummy userdata.img to sdk_addon images.
Avd manager in Android Studio requires userdata.img in the downloaded
system image. As we no longer inlcude the real userdata.img, we copy the
dummy userdata.img to pass the check.
This cl does not impact real devices.

BUG: 110492064
Test: Manual
1, Build with command "make -j110 PRODUCT-sdk_gphone_x86-sdk_addon".
2, Check if the dummy userdata.img appears in sdk addon image zip.
Change-Id: Icb88aac42921502288efe7355b8cd76704d5eb30
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-22 23:01:57 +00:00
TreeHugger Robot fcf60d8f8a Merge "Do not copy userdata.img into sdk_addon/system-image.zip" into pi-dev 2018-06-01 05:01:50 +00:00
Jae Shin 3ba44eb916 Build VNDK snapshot for products aosp_[arm|x86]
P VNDK snapshot needs to include VNDK libs built for 64-bit binder
products, aosp_arm and aosp_x86. This change modifies the following:

1) Revise VNDK snapshot zip file name to use $TARGET_PRODUCT instead of
$TARGET_ARCH in order to distinguish aosp_arm and aosp_arm_ab.
2) Place 32-bit binder libs under a subdirectory 'binder32' such that
the snapshots can be uploaded to prebuilts/vndk/v{VER} with the following
directory structure:

  prebuilts/vndk/v{VER}/
    arm/
      arch-arm-armv7-a-neon/
        shared/
          ...
      binder32/
        arch-arm-armv7-a-neon/
          shared/
            ...
      ...
    arm64/
      arch-arm-armv7-a-neon/
      arch-arm64-armv8-a/
      ...
    ...

The 32-bit binder libs will be placed in a separate subdirectory so that
they can be easily phased out in future VNDK snapshots.

Bug: 80372796
Test: make -j vndk dist
Change-Id: I7cde2e706e0c2891bab762b9057672f57e798873
2018-05-30 21:23:57 +09:00
Weilun Du d61ff0f5e2 Do not copy userdata.img into sdk_addon/system-image.zip
userdata.img becomes 4GB in P and it doesn't work well with patcher in
android studio. We decided to remove userdata.img in system image zip
and generate userdata.img by emulator.
This cl does not impact real devices.

BUG: 79925096

Change-Id: I5406b28291f140e2ebdbcd7c6f684f60ac59b62b
Signed-off-by: Weilun Du <wdu@google.com>
2018-05-29 22:24:29 +00:00
TreeHugger Robot eeb98ae3df Merge "Add waves to vendor owner whitelist" into pi-dev 2018-05-22 07:26:54 +00:00
Alan Ma c2e074c081 Add a build task for cts_instant
Test: With other CLs in the topic, run 'm -j30 cts_instant'

bug: 79750671
Change-Id: Ib0381017300108a22919892070540b9e7f92aaf9
2018-05-18 14:09:03 -07:00
Fang Deng 42b9e05754 [DO NOT MERGE][Harness Separation] Update cts.mk to point to the new harness repo
CTS harness code is moved to the new git project.
Update cts.mk to point to the new repo.

Bug: 78461075
Bug: 79201478
Bug: 79695450
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter
CtsGestureTestCases
Test: cts/run_unit_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true
TARGET_PRODUCT=aosp_arm64

Change-Id: I94c03071ec3db5a52c0fc0185bf69e2e57da9b21
2018-05-15 18:28:24 -07:00
Jasmine Cha 61b2c70815 Add waves to vendor owner whitelist
Bug: 74360112
Test: AOSP build pass
Change-Id: I7dd78f13fec495111d82828229afabe53abba712
2018-05-14 21:50:28 +00:00
Fang Deng 8ebc942152 [Harness Separation] Move cts-tradefed to a new dir (cts.mk)
Move cts-tradefed to a new dir.
Fix cts.mk to point to the new dir.
Bug: 78461075
Bug: 79201478
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter CtsGestureTestCases
Test: cts/harness/tools/cts-tradefed/tests/run_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64

Change-Id: I8b610bf2f0b84baa7e8a30759f7d53d1b2a5d8f1
2018-05-03 10:53:37 -07:00
Dan Willemsen 5046d4c749 Disable warnings for unknown modules in package-modules.mk
We've had these warnings for a while, but we've still got a lot of
warnings that people have been trained to ignore. Lets just silence them
for now.

The Merged-In is just a random change from AOSP that isn't in pi-dev, to
stop this from being merged to master, where I'm just fixing the
warnings.

Bug: 77883700
Test: m  <fewer warnings>
Change-Id: I00d8173a527760d62dca5837bcc86d5f03b87e83
Merged-In: I78ca65e6f0c81f09e7da848eda797b3a8f97a521
2018-04-10 22:44:28 -07:00
jdesprez ccbedae0e6 Add loganalysis to cts
Tradefed depends on Loganalysis so it should also be part
of cts. Luckily there was no overlap (cts never called a
part of TF that use loganalysis) so it never failed
with classNotFound before.

Test: build cts
Bug: 75979908
Change-Id: I65edf4d1a46c20875e31a61ddfcd343dd7c639aa
Merged-In: I2542ecd077149f7165aff120d67054943df20b54
2018-03-19 23:49:33 +00:00
Nan Zhang 972bd248f9 Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
2018-02-22 02:36:22 +00:00
Nan Zhang 7e634580ba Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
2018-02-22 02:29:18 +00:00
Nan Zhang 0abdb5811d Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.
<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
2018-02-21 14:12:18 -08:00
Jae Shin df0ca38484 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca am: 6d5a2d54ff
am: 1e9b97e595

Change-Id: Ia3a7e7cd5319321bc97f482e9f0d0e2ad887666e
2018-01-05 01:36:44 +00:00
Jae Shin 1e9b97e595 Merge changes Ida449978,I8c6953f1 am: 8b759c08ca
am: 6d5a2d54ff

Change-Id: Ic7606d7572e7143324a210d56ce641f038d6b815
2018-01-05 01:31:12 +00:00
Jae Shin 8b759c08ca Merge changes Ida449978,I8c6953f1
* changes:
  Apply snapshot variant to vndk package module name
  Additionally package TARGET_2ND_ARCH variants
2018-01-05 01:16:06 +00:00
Justin Yun 825cd12add Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa am: 4c4976b2d2
am: 22b52db8eb

Change-Id: I6b4387271135f78aca240b3a1d677efc602859b3
2018-01-05 01:06:09 +00:00
Justin Yun 22b52db8eb Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot" am: fd3f4570fa
am: 4c4976b2d2

Change-Id: Ibedfef2ce641588e883e7bb1bc81929cc2ba2c5a
2018-01-05 00:55:32 +00:00
Justin Yun 4dff0c6974 BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot
When generating VNDK snapshot, BOARD_VNDK_RUNTIME_DISABLE must not be
'true' to have correct ld.config.txt file.

Bug: 71349776
Test: lunch aosp_arm64_ab-user; make -j vndk dist
Change-Id: I20b14addb2f4a191134a1a9943e328566ca48424
2018-01-05 09:40:47 +09:00
Jae Shin 7b02f90ab7 Merge "Apply change in prebuilt names for config files" am: b0f4677748 am: 67eabefbdb
am: bd0483aa1c

Change-Id: I51c348d36a4597251409962d5b2801478c558a06
2018-01-04 20:30:41 +00:00
Jae Shin bd0483aa1c Merge "Apply change in prebuilt names for config files" am: b0f4677748
am: 67eabefbdb

Change-Id: I9027a54b8e36386c26ec5a088524a91d2e6a989b
2018-01-04 20:26:37 +00:00
Jae Shin 893fca6e46 Additionally package TARGET_2ND_ARCH variants
Redefine VNDK snapshot top level dir with $(TARGET_PRODUCT) and
additionally package TARGET_2ND_ARCH build variants of libs since
they are needed by 32bit processes running on a 64bit device.

Test: m -j vndk dist
Bug: 71370248
Change-Id: I8c6953f1b52b61caf413559bab56b294479b6d86
2018-01-04 10:23:10 +09:00
Jae Shin 77c07dd6d0 Apply change in prebuilt names for config files
The suffix for VNDK config files ld.config.txt,
llndk.libraries.txt, and vndksp.libraries.txt has been changed to
*.$(PLATFORM_VNDK_VERSION).txt.

Refactor the paths-of-intermediates function such that instead of
parsing filenames from list of modules within the function,
provide the function a list of preprocessed
module_name:file_name pairs.

Bug: 70918357
Test: m -j vndk dist
Change-Id: I2d69b7822cef4c709e15a53f99c7ab2efb22406c
2018-01-04 10:07:30 +09:00
Bo Hu dbc18ce057 Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5 am: d7c9a7384a
am: d49a41350a

Change-Id: I52094812c9214340800f6ed3f0674ff8405b7f0c
2017-12-27 22:32:45 +00:00
Bo Hu d49a41350a Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5
am: d7c9a7384a

Change-Id: Id9b9e9d5421b6f5ba5717bd7c1a13ba8f3e4ac1d
2017-12-27 22:29:40 +00:00
Bo Hu 59e41c11d5 Merge "emulator: add check_emu_boot.mk, again" 2017-12-27 22:22:10 +00:00
Jae Shin fc52ef0a23 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2 am: a085258968
am: 2dc0a3860e

Change-Id: Ifb8947460156924ac8b682fa66aeaa23c3f3037a
2017-12-26 02:00:51 +00:00
Jae Shin 2dc0a3860e Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2
am: a085258968

Change-Id: I7d541c300ef228ad045e168a0354ed690686c086
2017-12-26 01:57:46 +00:00
Treehugger Robot 13349ed3c2 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" 2017-12-26 01:51:20 +00:00
bohu 93ac3b81eb emulator: add check_emu_boot.mk, again
"make check_emu_boot" will boot up emulator
and check whether it boots up or timed out.
On boot success, it will emit a file
BOOT_SUCCESS.txt in dist_dir;
On timed out, it will emit a file
BOOT_FAIL.txt in dist_dir

original cl breaks some build, and this
fixes it by incorporating the following cl

https://android-review.googlesource.com/c/platform/build/+/576282

Test: choosecombo 1 aosp_arm64_ab userdebug
      m -j checkbuild tests

Test: make check_emu_boot
Change-Id: I09cba4f8fde672f9ea685dee1c0c108f2c457e2a
2017-12-22 17:51:38 +00:00
Tobias Thierer db740efdf2 Merge "Revert "emulator: add check_emu_boot.mk"" am: 1d87b803f7 am: e63e713ce3
am: f0a1f751bd

Change-Id: Ica6fcefbc8e7863d7cf601921fb9a6958a34aed9
2017-12-22 15:19:48 +00:00
Tobias Thierer f0a1f751bd Merge "Revert "emulator: add check_emu_boot.mk"" am: 1d87b803f7
am: e63e713ce3

Change-Id: Id4c00917065f1492720f16ef522c5b97437eb9e6
2017-12-22 15:17:11 +00:00
Treehugger Robot 1d87b803f7 Merge "Revert "emulator: add check_emu_boot.mk"" 2017-12-22 15:10:16 +00:00
Tobias Thierer e01a5759b7 Revert "emulator: add check_emu_boot.mk"
This reverts commit bba0ef24c2.

Reason for revert: Broke aosp_arm64_ab-userdebug build on internal master.

Change-Id: I04ca552174bc2731cb69ee8485d50f4c190c0d27
2017-12-22 13:31:41 +00:00
bohu 73e2e58b9d Merge "emulator: add check_emu_boot.mk" am: 9b04b2984c am: 0b4a1edeae
am: f6ba825c0f

Change-Id: I7ddc02bedd7e56376a98b617e00f1e7a98b99fb4
2017-12-22 01:51:36 +00:00
Jae Shin 0b1792e29b Add check to ensure PLATFORM_VNDK_VERSION is set
Bug: 70918357
Test: m -j vndk dist
Change-Id: Ia4ae94db9feccb7c40edfe90c14eb552b69ef655
2017-12-22 10:46:51 +09:00
bohu f6ba825c0f Merge "emulator: add check_emu_boot.mk" am: 9b04b2984c
am: 0b4a1edeae

Change-Id: Ice2df5213ec17a66d4e5f07a8c04d021f5dea10a
2017-12-22 01:45:54 +00:00
Treehugger Robot 9b04b2984c Merge "emulator: add check_emu_boot.mk" 2017-12-22 01:34:41 +00:00
Dan Shi 12e5732070 Merge "Auto generate test config files" am: 3c28ff7bff am: 4ccd1a5a00
am: 26201a4d44

Change-Id: Id65ca55a8031ae354a8c98b3c59c02fcc6de276c
2017-12-21 22:30:46 +00:00
Dan Shi 26201a4d44 Merge "Auto generate test config files" am: 3c28ff7bff
am: 4ccd1a5a00

Change-Id: Ibc089081ab2925f8e3453eddf8c64d81d3b49596
2017-12-21 22:25:40 +00:00
Dan Shi 3c28ff7bff Merge "Auto generate test config files" 2017-12-21 21:53:12 +00:00
Jae Shin 74cdef0954 Merge "Package NOTICE files and record LOCAL_PATHs" am: 7f0e221942 am: 83c829d9b1
am: 87661c862a

Change-Id: Ibadbfa0cb64a302b970138cb954de8e0078014d1
2017-12-21 07:11:47 +00:00
bohu bba0ef24c2 emulator: add check_emu_boot.mk
"make check_emu_boot" will boot up emulator
and check whether it boots up or timed out.
On boot success, it will emit a file
BOOT_SUCCESS.txt in dist_dir;
On timed out, it will emit a file
BOOT_FAIL.txt in dist_dir.

Change-Id: I152228806175c116a5adceb8429b66cf829edd22
2017-12-20 21:24:02 -08:00
Jae Shin 87661c862a Merge "Package NOTICE files and record LOCAL_PATHs" am: 7f0e221942
am: 83c829d9b1

Change-Id: Ib2068d22125992c229a9e5ed8c2954dd32deef19
2017-12-21 03:02:12 +00:00
Dan Shi efb892d858 Auto generate test config files
This change allows one to run atest <module name>. The TradeFed test
config file will be automatically created in testcases directory based
on the settings.

Bug: 69929803, 69932044
Test: m -j NotificationStressTests libminijail_test
add following lines in notificationtests/Android.mk,
before "include $(BUILD_PACKAGE)"
LOCAL_COMPATIBILITY_SUITE := general-test

Change-Id: Ib5e9cd152d957b5d5beb6ed23a899a021a7e06d6
2017-12-20 15:05:17 -08:00
Jae Shin 410a1af4f9 Package NOTICE files and record LOCAL_PATHs
Copy the NOTICE files for VNDK shared libs from
$(TARGET_OUT_NOTICE_FILES).
Create module_paths.txt to record the LOCAL_PATH for VNDK shared
libs. The LOCAL_PATH values are needed to read the SHA value
of a library's git project from manifest.xml.

Test: m -j vndk dist
Bug: 70603439
Change-Id: I9574abb48a472cb69440f3e9213ffdd0c1cac266
2017-12-18 12:33:08 +09:00
Dan Shi d65958bf80 Merge "Create build artifact tradefed-tests_list.zip" am: 8c2007cf4d am: f23aa88514
am: 638fdf443b

Change-Id: I1074927c7be948f1df712f298b2487d3ea66f9d8
2017-12-15 23:40:12 +00:00
Dan Shi 638fdf443b Merge "Create build artifact tradefed-tests_list.zip" am: 8c2007cf4d
am: f23aa88514

Change-Id: Icb61400f9c88588fecf557155987dceff89827e6
2017-12-15 23:36:06 +00:00