diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-05 14:49:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-05 14:49:57 -0700 |
| commit | e1ec4b1713ec2f2954d9fc9f00ff49eee9a17ebb (patch) | |
| tree | 1379d6f2201f53ed009ba2a6b9fb489dafbe011c /app-launcher | |
| parent | e625051543ebc40677203c0ce178759cf2b9b2ea (diff) | |
| parent | 76720740d035ae00d8a1bb7eacc16570bc9e745d (diff) | |
| download | extras-e1ec4b1713ec2f2954d9fc9f00ff49eee9a17ebb.tar.gz | |
Merge "Convert to Soong" am: fa073f4988 am: 0a0cdc00ff
am: 76720740d0
Change-Id: I3421c0308d95c7bc0e0a922544df0e154a835985
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) |