aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSen Jiang <senj@google.com>2018-11-12 16:18:22 -0800
committerSen Jiang <senj@google.com>2018-11-12 16:42:27 -0800
commitb0afbdb369abc2bff68f0c3a6477f34e0cfc92d8 (patch)
tree8d06d4dda657ddadf863b0c62a8bf16cc378ce63
parentc4876e01829b8cf110ee33267bb1bad1f8ebb51d (diff)
downloadshflags-nougat-iot-release.tar.gz
Manually running brillo_update_payload fails because it now runs from out/soong/host/linux-x86/bin but shflags only exists in out/host if built by Android.mk. Test: brillo_update_payload Change-Id: I365b43ac60e73b4019d81583d8007ca2fafeeb8d
-rw-r--r--Android.bp25
-rw-r--r--Android.mk26
2 files changed, 25 insertions, 26 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5e5382e
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,25 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_prebuilt_binary {
+ name: "shflags",
+ device_supported: false,
+ host_supported: true,
+
+ srcs: ["src/shflags"],
+
+ relative_install_path: "lib/shflags",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ce19963..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := shflags
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := src/shflags
-LOCAL_MODULE_PATH := $(HOST_OUT_EXECUTABLES)/lib/shflags
-include $(BUILD_PREBUILT)