Commit graph

702 commits

Author SHA1 Message Date
Dan Shi
3e7b6d1c69 Merge "Copy shared libraries used by tests to testcases directory" am: 8b86ca8827 am: 0f4e535493
am: 550340760c

Change-Id: If1eaf53fca029de23eef2e43bb70dd7386735ff2
2018-11-05 13:39:26 -08:00
Dan Shi
6fe5bf0adb Copy shared libraries used by tests to testcases directory
This change collects the shared libraries files used by tests in
suite, and deploy the files to testcases/lib*. The shared libraries then
can be zipped in general-tests.zip and device-tests.zip. And the host
test can be run in TradeFed host based on build artifacts.

Bug: 111486845
Test: m -j general-tests; m -j device-tests
Confirm the test can run in testcases directory:
out/host/linux-x86/testcases$ ./net_test_avrcp/x86_64/net_test_avrcp
unzip general-tests.zip, confirm net_test_avrcp can run.

Change-Id: I4f9322118aa4891226ea318cbd1bcee6ca48b050
2018-11-04 19:51:59 -08:00
Julien Desprez
df9b2e8618 Merge "Remove host proto lib from cts jars" am: b8ca22ca30 am: 7401988272
am: b51ceb203e

Change-Id: Iaae44655a40a1fdae62b315ea2dbd15540b0d5bc
2018-10-23 16:29:18 -07:00
Julien Desprez
e483544cf5 Remove host proto lib from cts jars
The lib is already statically included in tradefed.jar.

Test: run cts-unit-tests
Bug: 118297021
Change-Id: I073b68216870b1e744ee35db82a7e03f11db6782
2018-10-23 09:38:09 -07:00
Colin Cross
e8def07454 Merge "Always define sdk_addon as phony" am: 1e0b2296ad am: 19751a16e7
am: f17c76460f

Change-Id: If1df5913bb8e50d6c3116f7595d9db5db24c09e4
2018-10-22 11:37:59 -07:00
Colin Cross
d0dbeb3758 Always define sdk_addon as phony
dist-write-files will add dist targets to the sdk_addon target,
but the sdk_addon target is not declared as phony when building
with mm (ONE_SHOT_MAKEFILE set), causing:
build/make/core/main.mk:1495: error: writing to readonly directory: "sdk_addon"

Always define sdk_addon as phony even if ONE_SHOT_MAKEFILE is set.

Bug: 118144231
Test: mm
Change-Id: I99d14a98a7597ebd694c765f94b0d6f4486860dc
2018-10-22 10:42:44 -07:00
Dan Willemsen
ad8e05d900 Merge "Remove check_emu_boot, it's no longer necessary" am: 6393560856 am: dfb64ca033
am: 786a5363cf

Change-Id: I5888c8236663d329594a9eafe812234402b344d2
2018-10-18 09:07:19 -07:00
Dan Willemsen
5d8bbbe885 Merge "Clean up DIST_DIR usages, move to dist-for-goals" am: d3e8e5321f am: c466bc0203
am: 91ebad1b6b

Change-Id: I03f6cc3ca7e8f0279ecdab6562ff45e814e303d9
2018-10-18 08:39:47 -07:00
Dan Willemsen
dfb64ca033 Merge "Remove check_emu_boot, it's no longer necessary"
am: 6393560856

Change-Id: I89e3fc589dd2840fdea28b98f0de400d51a2a95a
2018-10-17 17:20:50 -07:00
Dan Willemsen
b1e3357962 Remove check_emu_boot, it's no longer necessary
Bug: 117859878
Test: treehugger
Change-Id: I4e9ade9b5b9dc7d494101bbd0b0eb2b245244337
2018-10-17 11:13:07 -07:00
Dan Willemsen
c466bc0203 Merge "Clean up DIST_DIR usages, move to dist-for-goals"
am: d3e8e5321f

Change-Id: Ib9defade594f2ccfe21aa2e6dc01e1641d12d9af
2018-10-17 10:38:52 -07:00
Dan Willemsen
7537fd050f Clean up DIST_DIR usages, move to dist-for-goals
soong_ui now guarantees DIST_DIR is set in the environment, so remove
the default.

Use dist-for-goals instead of writing directly into DIST_DIR.

When building the system image, use DIST_DIR from the environment
instead of from make. This will eventually stop working, but this will
work for now.

Bug: 117463001
Test: m dist  (check gpl_source.tgz, logs/product_copy_files_ignored.txt)
Test: m out/target/product/generic/product_copy_files_ignored.txt
Change-Id: Ice557e0a148602cb8eb154efb747d416f0d0db59
2018-10-16 23:37:51 -07:00
Colin Cross
f4686696c4 Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94 am: 7307de5e0c am: 4aa10a3cc5
am: 1033e0516b

Change-Id: I208a549fc8dd99fb511327a1c9c4d07e4f6cf54b
2018-10-01 19:38:25 -07:00
Colin Cross
4aa10a3cc5 Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94
am: 7307de5e0c

Change-Id: Ifa95c4ec335d9bf913f851101f09c55840091dce
2018-10-01 19:15:18 -07:00
Colin Cross
8b6c94c744 Disable sdk_addon for mmm
mmm has a smaller view of the world and cannot generate sdk-addon
zip files.

Bug: 116818719
Test: m checkbuild
Change-Id: I9e73c0b84a42aaaa353704d6ab245b449166606d
2018-10-01 13:41:27 -07:00
Simran Basi
53de318fc2 Merge "Create an artifact to output module-info and OWNERS files in source code" am: 004b9b7b7d am: 33724676b9
am: aaf4d46865

Change-Id: I58f69b47fd0b6527f2bfae35442e369402e4539e
2018-09-26 15:05:19 -07:00
Simran Basi
33724676b9 Merge "Create an artifact to output module-info and OWNERS files in source code"
am: 004b9b7b7d

Change-Id: I3536b4c6268659117237fd3b3001c8a208e841f9
2018-09-26 14:48:44 -07:00
Treehugger Robot
004b9b7b7d Merge "Create an artifact to output module-info and OWNERS files in source code" 2018-09-26 21:37:54 +00:00
Matt Wachowski
d6f69c81f9 Merge "Added rules to include verified boot config in zip" am: 7e67802381 am: 7318443ea1
am: c7dde1c451

Change-Id: I197882ab7e6264e4f353f3f2737ee1ae0f113045
2018-09-26 10:39:46 -07:00
Matt Wachowski
7318443ea1 Merge "Added rules to include verified boot config in zip"
am: 7e67802381

Change-Id: Ibbf4b6bc2f37621ab255123e417b8ea04dd61694
2018-09-26 10:28:21 -07:00
Matt Wachowski
7e67802381 Merge "Added rules to include verified boot config in zip" 2018-09-26 17:15:11 +00:00
Simran Basi
03f5253020 Create an artifact to output module-info and OWNERS files in source code
Bug: 114242886
Test: make dist -j owners
      make dist -j module-info

Change-Id: I6d00928c25e3213a5563e64806e0c04530161581
2018-09-24 16:31:29 -07:00
Nan Zhang
d26d0e9072 Merge commit 'ee16bfa6ca876affd27c07e28fdfb7c67dcd16fb' into stage-aosp-master am: d332efd698
am: 854617d1ad

Change-Id: Ie2a1deea2cd634de30e298d7e37703d506e4221e
2018-09-18 20:55:36 -07:00
Nan Zhang
d332efd698 Merge commit 'ee16bfa6ca876affd27c07e28fdfb7c67dcd16fb' into stage-aosp-master
Test: m -j api-stubs-docs-jdiff
Change-Id: I927aadd930572365e823f4ae9636773a9820c9c8
2018-09-18 20:41:21 -07:00
Nan Zhang
e06305123b Delete apidiff.mk
Also remove the msg.mk files used for old apicheck.

And export jdiff-doc.zip generated by Soong.

Test: api-stubs-docs-diff
Bug: b/78245848
Change-Id: I329aa375623a7b7a121d58314dab694a326c9f0f
2018-09-17 15:33:13 -07:00
Matt Wachowski
9e4d5153b7 Added rules to include verified boot config in zip
Bug: b/78113934
Test: Local

Change-Id: I011a84e3804c6f2d217c723b9e05fd0f9a814e04
2018-09-14 09:53:14 -07:00
Brandon Lee
a010858f33 Merge "aidegen: add extra info to collect in module-info." am: 076b905763 am: e17d8163c1
am: 232218e0cf

Change-Id: Icaabe18db0ac6e5e6f42a54ea28d4987ec155c60
2018-09-13 17:05:45 -07:00
Brandon Lee
e17d8163c1 Merge "aidegen: add extra info to collect in module-info."
am: 076b905763

Change-Id: I3c32064f08f07d1e1dde130d5d248adf6519395c
2018-09-13 16:48:03 -07:00
Brandon Lee
5568c19ae1 aidegen: add extra info to collect in module-info.
- add "dependencies" and "srcs" to collect in module-info.mk.
- add "Srcs" in core/base_rules.mk

Bug: 112523202

Test: make out/target/product/generic_x86_64/module-info.json and
      generate out/target/product/generic_x86_64/module-info.json

Change-Id: I0669377b2e5e6b4ee225f1930bda208eff092dea
2018-09-12 17:39:32 +08:00
Dan Willemsen
19f738ca69 Merge "Mark more sdk targets as PHONY" am: 88207d0d65 am: 127e2da2d3
am: 90119f317e

Change-Id: Ic6a9116413274795584143888128ed4be481d9f4
2018-09-10 19:07:56 -07:00
Dan Willemsen
127e2da2d3 Merge "Mark more sdk targets as PHONY"
am: 88207d0d65

Change-Id: Ia1b5757f64583f4763a939c80951cf792a5d5071
2018-09-10 18:57:49 -07:00
Dan Willemsen
921f581bef Mark more sdk targets as PHONY
These are used in various dist-for-goal targets even if we're not
currently building the sdks, so they always need to be marked with
.PHONY.

Test: m dist
Change-Id: I1e11ae37c6d0fd6ef8a3e293cf7409773c1bf3ab
2018-09-10 15:14:09 -07:00
yangbill
bb8588c0ec Merge "ATest: Change module_name from list to single string." am: adee0d54d0 am: 92ea6769da
am: e45d2bf211

Change-Id: Ib4122819c183ec700b1057ab2fb23c88a5086024
2018-09-07 00:24:37 -07:00
yangbill
92ea6769da Merge "ATest: Change module_name from list to single string."
am: adee0d54d0

Change-Id: I5d51e26ae7231ce3b6109da214304a0336dd347c
2018-09-07 00:15:22 -07:00
Treehugger Robot
adee0d54d0 Merge "ATest: Change module_name from list to single string." 2018-09-07 07:07:13 +00:00
yangbill
f90b734c0c ATest: Change module_name from list to single string.
ATest's original module_name is designed as a single string.
The different type maybe cause some problem when loading module_name
data. Due to it expected it as a list but actually it will be a single
string after mod-info obj handling this data.

Bug: 113317515
Test: atest aapt2_tests
      atest hello_world_test
      atest BluetoothInstrumentationTests
      atest packages/apps/Bluetooth/tests/unit/Android.mk
      atest RunBluetoothRoboTests
      atest com.android.bluetooth
      atest libcore/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
        Multiple tests found:
	  0: libjavacore-unit-tests
          1: jsr166-tests
          2: core-ojtests-public
	  ...
      atest SSLSocketTest # Brings up 2 prompts, one for which file then one for which module
      make -j bit
      bit Settings
      bit hello_world_test
      bit BluetoothInstrumentationTests
      bit RunBluetoothRoboTests (Could not find module, but the same situation
          before applying this patch)


Change-Id: I46a14c675eabd7cebd82562954380a9a769e80b5
2018-08-30 05:06:32 +00:00
Sasha Smundak
ad1ef6f100 Merge "Do not call sort when setting ALL_DEPS.MODULES." am: acdaa8fbac am: e6c2066b13
am: 8458e87a7b

Change-Id: I6f21fa450e2bd4be697d222ad60ee9c24dea0c39
2018-08-29 11:46:17 -07:00
Sasha Smundak
e6c2066b13 Merge "Do not call sort when setting ALL_DEPS.MODULES."
am: acdaa8fbac

Change-Id: Ief13c8c4ce110be86d6b0f47238fa5a23903ecd8
2018-08-29 11:38:59 -07:00
Treehugger Robot
acdaa8fbac Merge "Do not call sort when setting ALL_DEPS.MODULES." 2018-08-29 18:28:41 +00:00
yangbill
d76744b363 Merge "Atest: add LOCAL_TEST_CONFIG to module_info.json" am: be4ad83ef3 am: 494c9442b6
am: 24d314939d

Change-Id: I710cfddbf8f6395600f5933c5f135064791ecbd4
2018-08-23 20:14:30 -07:00
yangbill
494c9442b6 Merge "Atest: add LOCAL_TEST_CONFIG to module_info.json"
am: be4ad83ef3

Change-Id: I83aadbe82ceebda3b52cb8d7e01003a96f722cec
2018-08-23 20:06:09 -07:00
yangbill
c9347b3167 Atest: add LOCAL_TEST_CONFIG to module_info.json
Bug: 112335032

Test: 1. Add LOCAL_TEST_CONFIG := ahat-tests.xml in
         art/tools/ahat/Android.mk for ahat-tests
      2. add ahat-tests.xml in local
      3. atest -m hello_world_test
      4. check module_info.json
         local_full_test_config": ["art/tools/ahat/ahat-tests.xml"]

Change-Id: Ice2a0c85979fa6b872c92aea5ff4a340342408ad
2018-08-24 09:29:11 +08:00
Colin Cross
fe9c0d47ce Merge "Fix reference to cleared global variable" am: 5d1688bf27 am: e50ba8fc87
am: 7f5272e7e3

Change-Id: I20d9fa3d7318420272cb11d643e0c70c6b9c2b7c
2018-08-20 21:07:09 -07:00
Colin Cross
e50ba8fc87 Merge "Fix reference to cleared global variable"
am: 5d1688bf27

Change-Id: Id1b4a96c99adb7be2ac27c867fe30d924a3663f6
2018-08-20 20:35:40 -07:00
Colin Cross
cceb7ab6d7 Fix reference to cleared global variable
Use PRIVATE_general_tests_list_zip inside the rule.  Also remove the
output files to make it more likely that an incremental build fails
the same was as a clean build.

Bug: 112865316
Test: rm $OUT/general-tests* && m general-tests
Change-Id: Idbca35f9ca71f65ef45ef026df41bd933fb9d37d
2018-08-20 19:26:33 -07:00
Colin Cross
b4fef6a81c Merge changes from topic "test_suite_harness_bp" am: c9f31dff01 am: 09935c266b
am: 7bdbeaabc3

Change-Id: Idfe5aad44315c4f64ad3e862a79b1826ac00ec7b
2018-08-20 10:52:14 -07:00
Colin Cross
1439037eb8 Move general-tests intermediates out of $(PRODUCT_OUT) am: 38f16dcf4e am: 8a670d6c61
am: 963e74f630

Change-Id: I3c1e153921befdc822d6cc27c133137593f6cee0
2018-08-20 10:51:28 -07:00
Colin Cross
f056e15743 Rename general-tests-* variables to general_tests_* am: 50d1c22efb am: 964748505d
am: 426a5f8806

Change-Id: I6f73d58ec194fbe5a2c36499c40c73eec2092dac
2018-08-20 10:50:44 -07:00
Colin Cross
09935c266b Merge changes from topic "test_suite_harness_bp"
am: c9f31dff01

Change-Id: I132397729b490d71e9466a18a505d49bf04c81be
2018-08-20 10:36:07 -07:00
Colin Cross
8a670d6c61 Move general-tests intermediates out of $(PRODUCT_OUT)
am: 38f16dcf4e

Change-Id: I5e4048d82a044ae587413f5c535a2893cb76fa25
2018-08-20 10:35:16 -07:00