Snap for 6439596 from a1182cb5e3ed263807e0c2233725874819411bce to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I6b19f99080bdf3ef6a978a85df6608b181bd2209

2 files changed, 33 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index 6d58846..173db03 100644
--- a/Android.bp
+++ b/Android.bp
@@ -139,29 +139,3 @@ 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
new file mode 100644
index 0000000..e2adf42
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,33 @@
+# 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