summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Cashman <dcashman@google.com>2017-04-04 10:44:05 -0700
committerDan Cashman <dcashman@google.com>2017-04-04 10:48:28 -0700
commitf92a38e36b87f89f1d51f49c7c2020be0a0f753e (patch)
treefb72f65dd594d363ef33c8b2f47fb1a45a70f3fc
parent2fbc9b893f804e904a73505312e7d9a4ab80fcff (diff)
downloadextras-f92a38e36b87f89f1d51f49c7c2020be0a0f753e.tar.gz
Fix cts alsr failure.
/data/nativetest is not present on user builds, so remove tests depending on that from CTS inclusion. Bug: 36888825 Bug: 36484285 Test: cts builds and runs (test no longer present) Change-Id: I7134a1dca6df03fdfa9c0cc7488abd4570a95e33
-rw-r--r--tests/kernel.config/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk
index 7fa92a18..9be5d9d0 100644
--- a/tests/kernel.config/Android.mk
+++ b/tests/kernel.config/Android.mk
@@ -15,15 +15,16 @@ test_c_flags := \
# Required Tests
cts_src_files := \
- aslr_test.cpp \
multicast_test.cpp \
pstore_test.cpp \
sysvipc_test.cpp \
logger_test.cpp
# Required plus Recommended Tests
+# TODO: move aslr_test.cpp back to cts_src_files b/36888825
test_src_files := \
$(cts_src_files) \
+ aslr_test.cpp \
aslr_rec_test.cpp \
mmc_max_speed_test.cpp \