Convert telephony-common from .mk to .bp
Test: build
Change-Id: I6fbf26ffd4aba2a45cbed4ef7662c096bedb60e8
Merged-In: I6fbf26ffd4aba2a45cbed4ef7662c096bedb60e8
(cherry picked from commit 61b10de62e8ca36d051650ad7cda368c76873704)
diff --git a/Android.bp b/Android.bp
index 9d6bc5b..790cb53 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,3 +26,41 @@
"src/java/android/telephony/**/*.html",
],
}
+
+java_library {
+ name: "telephony-common",
+ installable: true,
+
+ aidl: {
+ local_include_dirs: ["src/java"],
+ },
+ srcs: [
+ "src/java/**/*.java",
+ "src/java/**/I*.aidl",
+ "src/java/**/*.logtags",
+ ],
+
+ libs: [
+ "voip-common",
+ "ims-common",
+ "services",
+ "bouncycastle",
+ ],
+ static_libs: [
+ "telephony-protos",
+ "android.hardware.radio-V1.0-java",
+ "android.hardware.radio-V1.1-java",
+ "android.hardware.radio-V1.2-java",
+ "android.hardware.radio.config-V1.0-java",
+ "android.hardware.radio.deprecated-V1.0-java",
+ "android.hidl.base-V1.0-java",
+ ],
+
+ product_variables: {
+ pdk: {
+ // enable this build only when platform library is available
+ enabled: false,
+ },
+ },
+}
+
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 561aed0..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2011 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.
-
-# enable this build only when platform library is available
-ifneq ($(TARGET_BUILD_PDK), true)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
-LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \
- $(call all-Iaidl-files-under, src/java) \
- $(call all-logtags-files-under, src/java)
-
-LOCAL_JAVA_LIBRARIES := voip-common ims-common services bouncycastle
-LOCAL_STATIC_JAVA_LIBRARIES := \
- telephony-protos \
- android.hardware.radio-V1.0-java \
- android.hardware.radio-V1.1-java \
- android.hardware.radio-V1.2-java \
- android.hardware.radio.config-V1.0-java \
- android.hardware.radio.deprecated-V1.0-java \
- android.hidl.base-V1.0-java
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := telephony-common
-
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
-LOCAL_EMMA_INSTRUMENT := true
-endif
-
-include $(BUILD_JAVA_LIBRARY)
-
-# Include subdirectory makefiles
-# ============================================================
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif # non-PDK build