From a10d8c21aa395af478a14331a5cef0912e70f0bb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 28 Dec 2011 14:02:49 -0800
Subject: Improve makefiles of distributable packages

This takes the new restrictions into account, so that
the output from the self-extractors can be used with
full_maguro

Change-Id: I3e3b3614652ea8135414be994758b9fa25e8c44e
---
 self-extractors/ti/staging/device-maguro.mk       |  7 ++----
 self-extractors/ti/staging/proprietary/Android.mk | 29 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 self-extractors/ti/staging/proprietary/Android.mk

(limited to 'self-extractors/ti')

diff --git a/self-extractors/ti/staging/device-maguro.mk b/self-extractors/ti/staging/device-maguro.mk
index 6dc6a36..427009b 100644
--- a/self-extractors/ti/staging/device-maguro.mk
+++ b/self-extractors/ti/staging/device-maguro.mk
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH := vendor/ti/maguro
-
 # TI blob(s) necessary for Maguro hardware
-PRODUCT_COPY_FILES := \
-    $(LOCAL_PATH)/proprietary/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin \
-
+PRODUCT_PACKAGES := \
+    ducati-m3
diff --git a/self-extractors/ti/staging/proprietary/Android.mk b/self-extractors/ti/staging/proprietary/Android.mk
new file mode 100644
index 0000000..baf9aaa
--- /dev/null
+++ b/self-extractors/ti/staging/proprietary/Android.mk
@@ -0,0 +1,29 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),maguro)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := ducati-m3
+LOCAL_MODULE_OWNER := ti
+LOCAL_SRC_FILES := ducati-m3.bin
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .bin
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
+include $(BUILD_PREBUILT)
+
+endif
-- 
cgit v1.1