Merge "Convert external/neven/Android.mk file to Android.bp file" am: b71d4e6acfandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6ndk-sysroot-r21android10-mainline-resolv-releaseandroid10-mainline-networking-release

am: 28adb05bcc

Change-Id: I0a338b721d724aa31d1ae6d1c7b4c1ecc1329c72

2 files changed, 26 insertions, 33 deletions

diff --git a/Android.bp b/Android.bp
index 173db03..6d58846 100644
--- a/Android.bp
+++ b/Android.bp
@@ -139,3 +139,29 @@ cc_library_shared {
         },
     },
 }
+
+prebuilt_usr_share {
+    name: "RFFspeed_501.bmd",
+
+    //disable build in PDK
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
+    src: "Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd",
+    sub_dir: "bmd",
+}
+
+prebuilt_usr_share {
+    name: "RFFstd_501.bmd",
+
+    //disable build in PDK
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
+    src: "Embedded/common/data/APIEm/Modules/RFFstd_501.bmd",
+    sub_dir: "bmd",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e2adf42..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-#disable build in PDK
-ifneq ($(TARGET_BUILD_PDK),true)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := RFFspeed_501.bmd
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/bmd
-LOCAL_SRC_FILES := Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := RFFstd_501.bmd
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/bmd
-LOCAL_SRC_FILES := Embedded/common/data/APIEm/Modules/RFFstd_501.bmd
-include $(BUILD_PREBUILT)
-
-endif #TARGET_BUILD_PDK