diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-06-22 16:41:36 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-06-22 16:41:36 -0700 |
| commit | e87fd02adb938ee5a780de9b8c2b8ddd8f8e590b (patch) | |
| tree | 6fd1f4134cf099aa3b4836e1890cc030ac6f2aed /simpleperf/Android.mk | |
| parent | b2fae142fb4f9d039a96dbd34caa371a1e8ce415 (diff) | |
| download | extras-e87fd02adb938ee5a780de9b8c2b8ddd8f8e590b.tar.gz | |
Dist simpleperf executables in SDK targets
Bug: 28911532
Change-Id: I5ec387ee1bbdff1e62788aa1fe3995cb44b37754
Diffstat (limited to 'simpleperf/Android.mk')
| -rw-r--r-- | simpleperf/Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk index 847a4cb6..352e0da5 100644 --- a/simpleperf/Android.mk +++ b/simpleperf/Android.mk @@ -163,7 +163,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) LOCAL_SRC_FILES := main.cpp LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_target) -LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) ifdef TARGET_2ND_ARCH LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := simpleperf32 @@ -173,6 +172,11 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_EXECUTABLE) +$(call dist-for-goals,sdk,$(ALL_MODULES.simpleperf.BUILT)) +ifdef TARGET_2ND_ARCH +$(call dist-for-goals,sdk,$(ALL_MODULES.simpleperf$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT)) +endif + # simpleperf host include $(CLEAR_VARS) LOCAL_MODULE := simpleperf @@ -189,6 +193,8 @@ LOCAL_MULTILIB := first include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_EXECUTABLE) +$(call dist-for-goals,sdk,$(LOCAL_BUILT_MODULE):simpleperf_host) +$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_simpleperf.BUILT)) # simpleperf_unit_test # ========================================================= @@ -223,7 +229,6 @@ LOCAL_SRC_FILES := \ $(simpleperf_unit_test_src_files_linux) \ LOCAL_STATIC_LIBRARIES += libsimpleperf $(simpleperf_static_libraries_target) -LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) LOCAL_POST_LINK_CMD = \ TMP_FILE=`mktemp $(OUT_DIR)/simpleperf-post-link-XXXXXXXXXX` && \ (cd $(LOCAL_PATH)/testdata && zip - -0 -r .) > $$TMP_FILE && \ @@ -265,7 +270,6 @@ LOCAL_MODULE := simpleperf_cpu_hotplug_test LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) LOCAL_SRC_FILES := $(simpleperf_cpu_hotplug_test_src_files) LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_target) -LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) LOCAL_MULTILIB := both LOCAL_FORCE_STATIC_EXECUTABLE := true include $(LLVM_DEVICE_BUILD_MK) @@ -302,7 +306,6 @@ LOCAL_MODULE := libsimpleperf_cts_test LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) LOCAL_SRC_FILES := $(libsimpleperf_cts_test_src_files) LOCAL_STATIC_LIBRARIES := $(simpleperf_static_libraries_target) -LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) LOCAL_MULTILIB := both LOCAL_FORCE_STATIC_EXECUTABLE := true include $(LLVM_DEVICE_BUILD_MK) |