Commit Graph

718 Commits

Author SHA1 Message Date
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
Colin Cross
964748505d Rename general-tests-* variables to general_tests_*
am: 50d1c22efb

Change-Id: Ic4698cee14ef532a7dde7235ad662f6e4b6809ab
2018-08-20 10:34:23 -07:00
Colin Cross
b0d376f66b Add tools jars to general-tests.zip
Some non-tests were marked with
LOCAL_COMPATIBILITY_SUITE := general-tests
in order to get them into general-tests.zip. Soong is attempting to
only allow the test_suites property on tests.  Specify the tools
needed in the test suite in general-tests.mk instead, the same
way cts.mk does.

Bug: 112654980
Test: m checkbuild
Test: tradefed/general_tests_zip
Change-Id: Ied7a6b2f956b84659c3edcf4dd866a8cd936bedf
2018-08-17 22:59:12 -07:00
Colin Cross
38f16dcf4e Move general-tests intermediates out of $(PRODUCT_OUT)
Move intermediate files used to generate general-tests.zip out of
$(PRODUCT_OUT) to better isolate the rule.

Test: m checkbuild
Change-Id: I5f3d204cc4e36b6c6670aabe0e63bce8597afd4b
2018-08-17 22:56:24 -07:00
Colin Cross
50d1c22efb Rename general-tests-* variables to general_tests_*
Make supports dashes in variable names, but underscores are more
common.  Also use a private variable for general_tests_list_zip,
and clear local variables at the end of the file.

Test: m checkbuild
Change-Id: I8fd968d9e674dbc630bdb71ddd375448b6ada5ed
2018-08-17 22:54:45 -07:00
Sasha Smundak
1c31492ce0 Do not call sort when setting ALL_DEPS.MODULES.
This particular invocation of 'sort' is expensive (it may amount to 30%
of the total ckati execution time for the clean build).

Test: verify that the result of running 'm nothing' is unchanged,
verify that the result of running 'm -j deps-license
PROJ_PATH=packages/app/% DEP_PATH=external/%' is unchanged.

Change-Id: If1cfddd4dee24559a26ecceebdf03cf49cc5a367
2018-08-17 12:41:24 -07:00
Morris Lin
13ffe0f5aa Merge "module-info.mk: Output actual module_name." am: 76f68c6b0e am: 861ac1b65e
am: c0cdebf030

Change-Id: Id859a8049566250cdc727106a81be25322aa868c
2018-08-13 20:07:17 -07:00
Morris Lin
861ac1b65e Merge "module-info.mk: Output actual module_name."
am: 76f68c6b0e

Change-Id: I36ce757373ddd93bfa092d3957aca93fe1fe7cd8
2018-08-13 19:58:59 -07:00
Treehugger Robot
76f68c6b0e Merge "module-info.mk: Output actual module_name." 2018-08-14 02:48:26 +00:00
Morris Lin
a77d5a2dd6 module-info.mk: Output actual module_name.
Add actual module_name information to module-info.json, and atest can
get the actual module name instead of module_name with suffix.

Bug: 77288544

Test: make -j8
      m out/target/product/generic_x86_64/module-info.json

Change-Id: I1e2dfced10db7ef5d31d26dfeb6a6c50a073a519
2018-08-07 22:17:43 +08:00
Xin Li
13689ed8a5 Don't build STS when it does not exist. am: ea0366589a am: 195c9c9d42
am: 7cfae24e9a

Change-Id: Icc679bf5aa5422958679f080f7867f3c53c8c4c9
2018-07-30 18:38:39 -07:00
Xin Li
195c9c9d42 Don't build STS when it does not exist.
am: ea0366589a

Change-Id: Ie0db06f7f010a96887591b599304861e3cd6273e
2018-07-30 18:14:10 -07:00
Xin Li
ea0366589a Don't build STS when it does not exist.
Change-Id: I7d5f6e11c7369fa473108605183581ad00e83887
2018-07-30 16:42:46 -07:00
Jae Shin
b3df4a51d5 Merge "Remove workaround for libclang_rt.ubsan* vndk libs" am: 6e5b55bf7f am: 3bd5e7204d am: 6fe8c185a2
am: 4890293b77

Change-Id: Icf1ea2642d8f70b7e2c6013262d6ab91bf483681
2018-07-29 21:42:46 -07:00
Jae Shin
6fe8c185a2 Merge "Remove workaround for libclang_rt.ubsan* vndk libs" am: 6e5b55bf7f
am: 3bd5e7204d

Change-Id: Ic98e8fa22dd4721b27f3586175b4a637510ee230
2018-07-29 21:34:28 -07:00
Jae Shin
3bd5e7204d Merge "Remove workaround for libclang_rt.ubsan* vndk libs"
am: 6e5b55bf7f

Change-Id: I00c11e37267ca6d23a513849b4b5a7fb91c66b13
2018-07-29 21:30:18 -07:00
Treehugger Robot
6e5b55bf7f Merge "Remove workaround for libclang_rt.ubsan* vndk libs" 2018-07-30 04:24:29 +00:00
Julien Desprez
863c6f3861 Merge "Add a version.txt file to compatibility suite zips" am: aa2abc3324 am: 5ec361fff6 am: 40f0e6dfa7
am: 6535532aed

Change-Id: I8c766ed39d320984dfc024b3146afe3c886cb12b
2018-07-26 15:51:01 -07:00
Julien Desprez
40f0e6dfa7 Merge "Add a version.txt file to compatibility suite zips" am: aa2abc3324
am: 5ec361fff6

Change-Id: Ic2858e22703cfdb8ff5cea5d1de06993b0df8a0a
2018-07-26 15:22:18 -07:00
Julien Desprez
5ec361fff6 Merge "Add a version.txt file to compatibility suite zips"
am: aa2abc3324

Change-Id: I6775b48c36b323c2b7f502acb0a2e12fed04f4c9
2018-07-26 15:09:09 -07:00
Julien Desprez
7a10601e7c Add a version.txt file to compatibility suite zips
This will avoid having to tag jar file with a manifest
implementation version.

Test: make cts, check the zip
Bug: 111834256
Change-Id: Id809217cefb36b4779fdf41c02f5809ba22d03a1
2018-07-26 11:47:46 -07:00
Jae Shin
4b6ba7e0df Remove workaround for libclang_rt.ubsan* vndk libs
libclang_rt.ubsan* VNDK core libraries are no longer built
for all arch flavors. Now, only the TARGET[_2ND]_ARCH-specific
libs are builts. Therefore no need to filter-out and re-add
libclang_rt.ubsan* VNDK core libraries.

Test: m -j vndk
Change-Id: I48080c1cd546cfc9f14313a3c9559d5c1bb2fdbe
2018-07-26 12:14:12 +09:00
Jae Shin
d4e8915f20 Merge "Additionally check TARGET_IS_64_BIT for binder bitness" am: bd74c0cb0e am: 0b3a91c19d am: 157811e4dc
am: 0365608f48

Change-Id: If241fac94b73a99b5c77a0464e050ad1541bb537
2018-07-24 02:30:42 -07:00
Jae Shin
157811e4dc Merge "Additionally check TARGET_IS_64_BIT for binder bitness" am: bd74c0cb0e
am: 0b3a91c19d

Change-Id: I9296ad4354d38c4ad19d61a42a8c558c0bf683cd
2018-07-24 02:22:06 -07:00
Jae Shin
0b3a91c19d Merge "Additionally check TARGET_IS_64_BIT for binder bitness"
am: bd74c0cb0e

Change-Id: Id56ca32e6a810cacdc71776abfda69e9f76edaed
2018-07-24 02:18:19 -07:00
Jae Shin
f1e9d4f62f Additionally check TARGET_IS_64_BIT for binder bitness
Since TARGET_USES_64_BIT_BINDER could be not set, first check
TARGET_IS_64_BIT when determining binder bitness.

Test: lunch aosp_walleye-userdebug && m -j vndk, then check
directory structure
Bug: 111773572

Change-Id: If75d5946b38d7b5bc15798b273e0450035c8c43a
2018-07-24 16:12:42 +09:00
bohu
8a7d0202e4 emulator: fix a typo when copying userdata.img am: a83fc0e482
am: bb47ecdbfe

Change-Id: I31599133ad6d5ad336b2644a6723bb1e91ba497b
2018-06-29 12:40:22 -07:00
bohu
bb47ecdbfe emulator: fix a typo when copying userdata.img
am: a83fc0e482

Change-Id: If8e921aff76dfabfcebb90180697787d863fe77a
2018-06-29 12:37:12 -07:00
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
65afe0f806 Copy dummy userdata.img to sdk_addon images. am: 2276fb95cf
am: fc9919cd3d

Change-Id: I0125827a4b83e0dd7951c1fc526ac9c00dd02894
2018-06-25 12:14:57 -07:00
Weilun Du
fc9919cd3d Copy dummy userdata.img to sdk_addon images.
am: 2276fb95cf

Change-Id: Ic9a6f997bf26593665d4f6572b48174622c8a90e
2018-06-25 12:11:46 -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
Dan Willemsen
028b782d5f Merge changes I101ced40,If9a4bed2 am: 949404a65b am: faad18291a
am: 0e32442652

Change-Id: Ieac06598f263279c202ede760b49c201f339f13a
2018-06-19 13:48:28 -07:00
Dan Willemsen
faad18291a Merge changes I101ced40,If9a4bed2
am: 949404a65b

Change-Id: I5f8f5a0b4921f54253d73d0c893a9f326ebded09
2018-06-19 13:42:23 -07:00
Dan Willemsen
649311868c Fix vndk packaging to stop depending on phony targets
These had been depending on the phony target for the library
(liblz4.vendor), not the actual built file and notice file.

Since we hadn't been saving the NOTICE file, and were only assuming the
installed notice file path. save that away for use during packaging.

Test: m vndk; diff out/target/product/generic/android-vndk-aosp_arm.zip
Test: m vndk; diff out/target/product/generic_arm64/android-vndk-aosp_arm64.zip
Change-Id: If9a4bed27030b7bd464cd3987739df94d32a0037
2018-06-19 09:26:58 -07:00