diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-05-04 18:35:50 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-05-04 20:25:22 -0700 |
| commit | 2a904afcb32568d3c33d56971c7b1783e265c8d5 (patch) | |
| tree | 2ac40ff8a86c94ba1278ec98a7c59e19e579aafd /app-launcher | |
| parent | a1b34a8173609094df0e124ecca19b619fc19a41 (diff) | |
| download | extras-2a904afcb32568d3c33d56971c7b1783e265c8d5.tar.gz | |
Convert to Soong
See build/soong/README.md for more information.
This effectively moves some of these targets from /system/xbin to
/system/bin, as Soong is not supporting xbin. I've attempted to fix and
find any external dependencies to these paths.
Test: m anrd app-launcher bootctrl.default bootctl cpustats crypto iotop
Change-Id: I3eb58d8a260884652b5ee827ac88ece429d76448
Diffstat (limited to 'app-launcher')
| -rw-r--r-- | app-launcher/Android.bp | 26 | ||||
| -rw-r--r-- | app-launcher/Android.mk | 28 |
2 files changed, 32 insertions, 22 deletions
diff --git a/app-launcher/Android.bp b/app-launcher/Android.bp new file mode 100644 index 00000000..7585607e --- /dev/null +++ b/app-launcher/Android.bp @@ -0,0 +1,26 @@ +cc_defaults { + name: "computestats-defaults", + + cflags: [ + "-Wall", + "-Werror", + ], + + target: { + darwin: { + enabled: false, + }, + }, +} + +cc_binary_host { + name: "computestats", + defaults: ["computestats-defaults"], + srcs: ["computestats.c"], +} + +cc_binary_host { + name: "computestatsf", + defaults: ["computestats-defaults"], + srcs: ["computestatsf.c"], +} diff --git a/app-launcher/Android.mk b/app-launcher/Android.mk index cef9daaa..5df6eb9e 100644 --- a/app-launcher/Android.mk +++ b/app-launcher/Android.mk @@ -1,26 +1,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -#LOCAL_32_BIT_ONLY = true +LOCAL_MODULE := app-launcher +LOCAL_IS_HOST_MODULE := true +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_SRC_FILES := app-launcher LOCAL_MODULE_HOST_OS := linux -LOCAL_SRC_FILES := computestatsf.c -LOCAL_MODULE := computestatsf -LOCAL_CFLAGS := -Wall -Werror -LOCAL_MODULE_TAGS := debug -include $(BUILD_HOST_EXECUTABLE) - -include $(CLEAR_VARS) -#LOCAL_32_BIT_ONLY = true -LOCAL_MODULE_HOST_OS := linux -LOCAL_SRC_FILES := computestats.c -LOCAL_MODULE := computestats -LOCAL_CFLAGS := -Wall -Werror -LOCAL_MODULE_TAGS := debug -include $(BUILD_HOST_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_PREBUILT_EXECUTABLES := app-launcher -LOCAL_MODULE_HOST_OS := linux -LOCAL_MODULE_TAGS := debug -LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) -include $(BUILD_HOST_PREBUILT) +LOCAL_REQUIRED_MODULES := computestats computestatsf +include $(BUILD_PREBUILT) |