diff options
author | Trevor Radcliffe <tradical@google.com> | 2021-10-19 20:17:47 +0000 |
---|---|---|
committer | Trevor Radcliffe <tradical@google.com> | 2021-10-19 20:24:05 +0000 |
commit | a6e8cc7b402d9d4a5a7e24f52c58956106f77429 (patch) | |
tree | e2645848dd93f6fe6e73fb26c2a6a294ad95f1ef /su | |
parent | 381f06a45e4d1e7fbd6a5d920769539cce5952b0 (diff) | |
download | extras-a6e8cc7b402d9d4a5a7e24f52c58956106f77429.tar.gz |
Migrate su to Soong with xbin
Tried to migrate su to Soong and put it in bin, and that broke
stuff. This time, we're leaving it in xbin to avoid breaking
those things.
Fixes: 202384734
Test: Run tests
Test: Confirm that su was placed in xbin
Change-Id: I33333de70d69b79da2072da4e76a08d7a05d1e59
Diffstat (limited to 'su')
-rw-r--r-- | su/Android.bp | 29 | ||||
-rw-r--r-- | su/Android.mk | 17 |
2 files changed, 29 insertions, 17 deletions
diff --git a/su/Android.bp b/su/Android.bp new file mode 100644 index 00000000..86e44fb4 --- /dev/null +++ b/su/Android.bp @@ -0,0 +1,29 @@ +package { + 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", + + cflags: [ + "-Wall", + "-Werror", + ], + + srcs: ["su.cpp"], + + install_in_xbin: true, + + header_libs: ["libcutils_headers"], +} diff --git a/su/Android.mk b/su/Android.mk deleted file mode 100644 index 18493992..00000000 --- a/su/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -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) |