From 2bd29ca1f00fa604ec38cf4368e2d0619fc7ae73 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Fri, 11 Jan 2019 16:31:54 -0800
Subject: Convert Android.mk file to Android.bp

See build/soong/README.md for more information.

Change-Id: I02b14781a7a1c7fe93edfadce978487c28009200
Bug: 122333159
Fixes: 122333159
Test: treehugger
---
 PMC/Android.bp | 14 ++++++++++++++
 PMC/Android.mk | 22 ----------------------
 UID/Android.bp | 30 ++++++++++++++++++++++++++++++
 UID/Android.mk | 31 -------------------------------
 4 files changed, 44 insertions(+), 53 deletions(-)
 create mode 100644 PMC/Android.bp
 delete mode 100644 PMC/Android.mk
 create mode 100644 UID/Android.bp
 delete mode 100644 UID/Android.mk

diff --git a/PMC/Android.bp b/PMC/Android.bp
new file mode 100644
index 0000000..1c2b54a
--- /dev/null
+++ b/PMC/Android.bp
@@ -0,0 +1,14 @@
+android_app {
+    name: "PMC",
+    platform_apis: true,
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    privileged: true,
+    optimize: {
+        enabled: false,
+    },
+}
diff --git a/PMC/Android.mk b/PMC/Android.mk
deleted file mode 100644
index 875a343..0000000
--- a/PMC/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := PMC
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_DEX_PREOPT := false
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-
-# only include rules to build other stuff for the original package, not the derived package.
-#ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
-#endif
diff --git a/UID/Android.bp b/UID/Android.bp
new file mode 100644
index 0000000..76f160d
--- /dev/null
+++ b/UID/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright (C) 2017 Google, Inc.
+//
+// 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.
+//
+
+android_app {
+    name: "ConnectivityUIDTest",
+    sdk_version: "current",
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    privileged: true,
+    optimize: {
+        enabled: false,
+    },
+}
diff --git a/UID/Android.mk b/UID/Android.mk
deleted file mode 100644
index 6a83b1d..0000000
--- a/UID/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-##  Copyright (C) 2017 Google, Inc.
-#
-##  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_PACKAGE_NAME := ConnectivityUIDTest
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_DEX_PREOPT := false
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-- 
cgit v1.2.3