Merge "Revert "Migrate PlatformLibrary to Soong""
diff --git a/frameworks/Android.mk b/frameworks/Android.mk
new file mode 100644
index 0000000..5053e7d
--- /dev/null
+++ b/frameworks/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
diff --git a/frameworks/PlatformLibrary/Android.bp b/frameworks/PlatformLibrary/Android.bp
index cecf3ef..7b3ec73 100644
--- a/frameworks/PlatformLibrary/Android.bp
+++ b/frameworks/PlatformLibrary/Android.bp
@@ -28,13 +28,3 @@
],
java_version: "1.8",
}
-
-java_library {
- name: "com.example.android.platform_library",
- installable: true,
-
- srcs: ["**/*.java"],
-
- sdk_version: "current",
-}
-
diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk
new file mode 100644
index 0000000..db4c97c
--- /dev/null
+++ b/frameworks/PlatformLibrary/Android.mk
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2008 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.
+#
+
+ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
+
+# This makefile shows how to build your own shared library that can be
+# shipped on the system of a phone, and included additional examples of
+# including JNI code with the library and writing client applications against it.
+
+LOCAL_PATH := $(call my-dir)
+
+# the library
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ $(call all-subdir-java-files)
+
+LOCAL_MODULE_TAGS := optional
+
+# This is the target being built.
+LOCAL_MODULE:= com.example.android.platform_library
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_JAVA_LIBRARY)
+
+# The JNI component
+# ============================================================
+# Also build all of the sub-targets under this one: the library's
+# associated JNI code, and a sample client of the library.
+include $(CLEAR_VARS)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
+endif # JAVA_SUPPORT
