Commit Graph

671 Commits

Author SHA1 Message Date
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
Treehugger Robot
8c2007cf4d Merge "Create build artifact tradefed-tests_list.zip" 2017-12-15 23:25:01 +00:00
Colin Cross
426ecd0f60 Merge "Replace build/tools with build/make/tools" am: 973301af79 am: e6dc6b2026
am: eb6c8444a6

Change-Id: I14d033658d219e81790ab1e730b7e477c70f4a13
2017-12-13 03:03:47 +00:00
Colin Cross
eb6c8444a6 Merge "Replace build/tools with build/make/tools" am: 973301af79
am: e6dc6b2026

Change-Id: Ie3eb9e2b411603f95f91cac79ebe56eb78423da3
2017-12-13 02:49:40 +00:00
Treehugger Robot
973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Dan Shi
fdc95fe0ca Create build artifact tradefed-tests_list.zip
Bug: 69678490
Test: m -j dist tradefed-tests-list
Change-Id: Ie70228f4c128b23c5d169fc8baafc6507386b541
2017-12-12 13:42:33 -08:00
Ricardo Quesada
2dcb2362d7 Add org.chromium.arc to package_whitelist.txt
Add org.chromium.arc to package_whitelist.txt
This is needed from the org.chromium.arc EventLogTags file.

Bug: 70513529
Test: compiled on marlin. did not generate any conflict. marlin worked
      Ok

Change-Id: Ia4b0133f66677f988916457ab4b6c9332342a01b
2017-12-11 22:02:48 +00:00
Dan Shi
5274f19156 Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159 am: 3981526a34
am: 2ac0a5d472

Change-Id: Ic0e5a5482f239be073bd0f34579fd5c9ed032cbc
2017-12-11 21:02:31 +00:00
Dan Shi
2ac0a5d472 Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159
am: 3981526a34

Change-Id: I6433f33ccc6b21ba184321249303c05d4cbd2d1d
2017-12-11 20:57:55 +00:00
Treehugger Robot
9874428159 Merge "Create an artifact to include TEST_MAPPING files in source code" 2017-12-11 20:42:46 +00:00
Dan Shi
a20b6aa331 Merge "Create artifacts to include the list of test configs" am: c6b28799e9 am: 00d3e58d1c
am: aa9f05a409

Change-Id: Ieb9380ef416c897b07af7444152e547cfa03f688
2017-12-08 01:04:46 +00:00
Dan Shi
34f86d2623 Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8 am: 477427a62c
am: 0c76aa1f03

Change-Id: I0815b039c4fb06ed6d1f44b5b113b8ece71eed4a
2017-12-08 01:02:33 +00:00
Dan Shi
aa9f05a409 Merge "Create artifacts to include the list of test configs" am: c6b28799e9
am: 00d3e58d1c

Change-Id: Ieba99654675f2c347f91f2ba0d41de970a86889c
2017-12-08 00:58:12 +00:00
Treehugger Robot
c6b28799e9 Merge "Create artifacts to include the list of test configs" 2017-12-08 00:43:20 +00:00
Dan Shi
8f1263114b Create artifacts to include the list of test configs
Bug: 69678490
Test: m -j dist device-tests general-tests
confirm out/dist has device-tests_list.zip and general-tests_list.zip

Change-Id: I185bc66907e37aa5f5da70b2d1b838a73d5f1a51
2017-12-07 14:37:05 -08:00
Dan Shi
0c76aa1f03 Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8
am: 477427a62c

Change-Id: Ia5e54d76c854084bc28926062e1dea721d0242e8
2017-12-07 22:19:20 +00:00
Dan Shi
567eede9b6 Create an artifact to include the list of integrated tests in TradeFed
In TF projects, we can add dir to COMPATIBILITY.tradefed_tests_dir to
include the test names in the artifact, e.g.,
LOCAL_PATH := $(call my-dir)
COMPATIBILITY.tradefed_tests_dir := \
  $(COMPATIBILITY.tradefed_tests_dir) $(LOCAL_PATH)/res/config

Bug: 69678490
Test: m -j dist tradefed-tests-list
Confirm out/dist/tradefed-tests-list.zip exists and has a file
tradefed-tests-list which contains the list of tests.

Change-Id: I67b82e5aeec68e9263bada198669b4a23a0750cb
2017-12-06 17:19:13 -08:00