Android.mk files: fix aosp master compiling errorandroid-linaro-p-preview

-    LOCAL_MODULE_CLASS := tests
1. change to set set LOCAL_MODULE_CLASS := NATIVE_TESTS
   tests is not supported now
2. remove the dependency for systemtarball which is not supported now

Change-Id: I49d4ac866582cba8e64000a7abc6f78c4d8d96b6
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

9 files changed, 10 insertions, 20 deletions

diff --git a/Switches/Android.mk b/Switches/Android.mk
index 1b4705e..29ceeca 100644
--- a/Switches/Android.mk
+++ b/Switches/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := tests
+LOCAL_MODULE_CLASS := NATIVE_TESTS
 LOCAL_MODULE := Switches.sh
 LOCAL_SRC_FILES := Switches.sh
 LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/Switches
diff --git a/cpufreq/Android.mk b/cpufreq/Android.mk
index 76e7c22..9a88c50 100644
--- a/cpufreq/Android.mk
+++ b/cpufreq/Android.mk
@@ -6,9 +6,8 @@ module_name = cpufreq
 define $(module_name)_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
diff --git a/cpuhotplug/Android.mk b/cpuhotplug/Android.mk
index 41b6c79..fc5841a 100644
--- a/cpuhotplug/Android.mk
+++ b/cpuhotplug/Android.mk
@@ -6,9 +6,8 @@ module_name = cpuhotplug
 define $(module_name)_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
@@ -21,9 +20,8 @@ $(foreach item,$(test_num),$(eval $(call $(module_name)_add_executable, $(module
 define $(module_name)_etc_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
     include $(BUILD_PREBUILT)
diff --git a/cpuidle/Android.mk b/cpuidle/Android.mk
index 1ce0831..c544d42 100644
--- a/cpuidle/Android.mk
+++ b/cpuidle/Android.mk
@@ -6,10 +6,9 @@ module_name = cpuidle
 define $(module_name)_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_CFLAGS += "-D__unused=__attribute__((unused))"
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
@@ -21,7 +20,6 @@ $(foreach item,$(test_num),$(eval $(call $(module_name)_add_executable, $(module
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := cpuidle_killer
-systemtarball: cpuidle_killer
 systemimage: cpuidle_killer
 LOCAL_SRC_FILES:= cpuidle_killer.c
 LOCAL_SHARED_LIBRARIES := libcutils libc
diff --git a/cputopology/Android.mk b/cputopology/Android.mk
index f1c2821..dcc9df5 100644
--- a/cputopology/Android.mk
+++ b/cputopology/Android.mk
@@ -6,9 +6,8 @@ module_name = cputopology
 define $(module_name)_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
diff --git a/include/Android.mk b/include/Android.mk
index 9d65610..9942f5f 100644
--- a/include/Android.mk
+++ b/include/Android.mk
@@ -6,9 +6,8 @@ module_name = include
 define $(module_name)_etc_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
diff --git a/suspend/Android.mk b/suspend/Android.mk
index f655282..c6e37ab 100644
--- a/suspend/Android.mk
+++ b/suspend/Android.mk
@@ -6,9 +6,8 @@ module_name = suspend
 define $(module_name)_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
diff --git a/thermal/Android.mk b/thermal/Android.mk
index 9f1d998..42d4595 100644
--- a/thermal/Android.mk
+++ b/thermal/Android.mk
@@ -6,9 +6,8 @@ module_name = thermal
 define $(module_name)_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1.sh
-    systemtarball: $1.sh
     systemimage: $1.sh
     LOCAL_SRC_FILES := $1.sh
     LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name)
diff --git a/utils/Android.mk b/utils/Android.mk
index 53133ac..5f0d524 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -6,9 +6,8 @@ module_name = utils
 define $(module_name)_etc_add_executable
     include $(CLEAR_VARS)
     LOCAL_MODULE_TAGS := optional 
-    LOCAL_MODULE_CLASS := tests
+    LOCAL_MODULE_CLASS := NATIVE_TESTS
     LOCAL_MODULE := $1
-    systemtarball: $1
     systemimage: $1
     LOCAL_SRC_FILES := $1.c
     LOCAL_CFLAGS += "-D__unused=__attribute__((unused))"