summaryrefslogtreecommitdiff
path: root/app-launcher
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2019-03-28 10:37:19 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-28 10:37:19 -0700
commit61962565ec768372867df51c6526103cced5523a (patch)
tree55fd7550a1b09ff31e8d21aa859dc6ddaf6b54a9 /app-launcher
parentff20d16de77dd4715fe48845b54855f28ba50739 (diff)
parent07bcf1a5c3e29564047de2b0d72b2c80cebb0176 (diff)
downloadextras-61962565ec768372867df51c6526103cced5523a.tar.gz
Merge "Convert more of system/extras to Android.bp" am: 0a35afacda am: 03cc6a3537
am: 07bcf1a5c3 Change-Id: Iaff58bceea0b9f344cef8422211be668803fd374
Diffstat (limited to 'app-launcher')
-rw-r--r--app-launcher/Android.bp14
-rw-r--r--app-launcher/Android.mk10
2 files changed, 14 insertions, 10 deletions
diff --git a/app-launcher/Android.bp b/app-launcher/Android.bp
index 7585607e..bf7b2798 100644
--- a/app-launcher/Android.bp
+++ b/app-launcher/Android.bp
@@ -24,3 +24,17 @@ cc_binary_host {
defaults: ["computestats-defaults"],
srcs: ["computestatsf.c"],
}
+
+sh_binary_host {
+ name: "app-launcher",
+ src: "app-launcher",
+ required: [
+ "computestats",
+ "computestatsf",
+ ],
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
+}
diff --git a/app-launcher/Android.mk b/app-launcher/Android.mk
deleted file mode 100644
index 5df6eb9e..00000000
--- a/app-launcher/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := app-launcher
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_SRC_FILES := app-launcher
-LOCAL_MODULE_HOST_OS := linux
-LOCAL_REQUIRED_MODULES := computestats computestatsf
-include $(BUILD_PREBUILT)