diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2021-05-07 08:34:18 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2021-05-07 08:34:18 +0000 |
| commit | 02c34c329cc2774cbf80b3e9036270c9ea46799f (patch) | |
| tree | a117093296d791fe706aa93d1d52f3051706611f /su | |
| parent | 2ef7e585f255d320af5d9180aa58662f4a8a8f5f (diff) | |
| download | extras-02c34c329cc2774cbf80b3e9036270c9ea46799f.tar.gz | |
Revert "Convert su/Android.mk to Android.bp"
This reverts commit 2ef7e585f255d320af5d9180aa58662f4a8a8f5f.
Reason for revert: Checking for culprit of b/187481237
Change-Id: I636382794fe35c967f62e19abda2eb8ee5b76bb3
Diffstat (limited to 'su')
| -rw-r--r-- | su/Android.bp | 21 | ||||
| -rw-r--r-- | su/Android.mk | 17 |
2 files changed, 17 insertions, 21 deletions
diff --git a/su/Android.bp b/su/Android.bp deleted file mode 100644 index 2616e37c..00000000 --- a/su/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -package { - // See: http://go/android-license-faq - default_applicable_licenses: ["system_extras_su_license"], -} - -license { - name: "system_extras_su_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "NOTICE", - ], -} - -cc_binary { - name: "su", - srcs: ["su.cpp"], - header_libs: ["libcutils_headers"], -} diff --git a/su/Android.mk b/su/Android.mk new file mode 100644 index 00000000..18493992 --- /dev/null +++ b/su/Android.mk @@ -0,0 +1,17 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_CFLAGS := -Wall -Werror + +LOCAL_SRC_FILES:= su.cpp + +LOCAL_MODULE:= su +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS:= notice +LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE + +LOCAL_HEADER_LIBRARIES := libcutils_headers + +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) + +include $(BUILD_EXECUTABLE) |