diff options
| author | Vishal Bhoj <vishal.bhoj@hackbox.linaro.org> | 2015-02-18 13:24:40 -0800 |
|---|---|---|
| committer | Lisa Nguyen <lisa.nguyen@linaro.org> | 2015-02-18 16:46:47 -0800 |
| commit | de3c5f3e638ac6298da687d72cfb73351f5d7d65 (patch) | |
| tree | 70e13d0abf961f3a0f5a3ccec4c3f1000f1d1fa7 | |
| parent | 578b349f6fa2795ff0544038e6e390be5b83868a (diff) | |
| download | pm-qa-de3c5f3e638ac6298da687d72cfb73351f5d7d65.tar.gz | |
Fix Android.mk for building on Android 5.0
Signed-off-by: Vishal Bhoj <vishal.bhoj@hackbox.linaro.org>
[Fix minor merge issues so Vishal's patch could apply.]
Signed-off-by: Lisa Nguyen <lisa.nguyen@linaro.org>
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | Switches/Android.mk | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | Switches/Switches.sh (renamed from Switches.sh) | 0 | ||||
| -rw-r--r-- | cpuidle/Android.mk | 2 |
4 files changed, 9 insertions, 10 deletions
@@ -1,11 +1,2 @@ include $(call all-subdir-makefiles) -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_CLASS := tests -LOCAL_MODULE := Switches.sh -LOCAL_SRC_FILES := ../../external/pm-qa/Switches.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa -include $(BUILD_PREBUILT) diff --git a/Switches/Android.mk b/Switches/Android.mk new file mode 100644 index 0000000..d5b1a93 --- /dev/null +++ b/Switches/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_CLASS := tests +LOCAL_MODULE := Switches.sh +LOCAL_SRC_FILES := Switches.sh +LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa +include $(BUILD_PREBUILT) diff --git a/Switches.sh b/Switches/Switches.sh index ed67481..ed67481 100644..100755 --- a/Switches.sh +++ b/Switches/Switches.sh diff --git a/cpuidle/Android.mk b/cpuidle/Android.mk index 1d1292c..5534ffc 100644 --- a/cpuidle/Android.mk +++ b/cpuidle/Android.mk @@ -21,7 +21,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := cpuidle_killer systemtarball: cpuidle_killer LOCAL_SRC_FILES:= cpuidle_killer.c -LOCAL_STATIC_LIBRARIES := libcutils libc +LOCAL_SHARED_LIBRARIES := libcutils libc LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/pm-qa/$(module_name) include $(BUILD_EXECUTABLE) |