Revert "Migrate su to Soong"

This reverts commit 32b779eb50cb25137c12f46052efa5622000d2e3.

Reason for revert: Broke tests

Change-Id: Iffb2e4e68dc038a5e4819773188c2bc89c4d41e4

2 files changed, 17 insertions, 43 deletions

diff --git a/su/Android.bp b/su/Android.bp
deleted file mode 100644
index bf4f6e30..00000000
--- a/su/Android.bp
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright (C) 2021 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.
-//
-
-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"],
-
-    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)