Merge "Convert android-common to Android.bp"android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7

2 files changed, 25 insertions, 11 deletions

diff --git a/common/Android.bp b/common/Android.bp
new file mode 100644
index 00000000..e37d3b85
--- /dev/null
+++ b/common/Android.bp
@@ -0,0 +1,25 @@
+// Copyright (C) 2009 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.
+
+// Note: the source code is in java/, not src/, because this code is also part of
+// the framework library, and build/core/pathmap.mk expects a java/ subdirectory.
+
+java_library_static {
+    name: "android-common",
+    sdk_version: "8",
+    srcs: [
+        "java/**/*.java",
+        "java/**/*.logtags",
+    ],
+}
diff --git a/common/Android.mk b/common/Android.mk
index 65a22fe9..187fa9e7 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -14,17 +14,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# Note: the source code is in java/, not src/, because this code is also part of
-# the framework library, and build/core/pathmap.mk expects a java/ subdirectory.
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-common
-LOCAL_SDK_VERSION := 8
-LOCAL_SRC_FILES := \
-     $(call all-java-files-under, java) \
-     $(call all-logtags-files-under, java)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
 # Build the test package
 # we can't build the test for apps only build, because android.test.runner is not unbundled yet.
 ifeq ($(TARGET_BUILD_APPS),)