From a10d8c21aa395af478a14331a5cef0912e70f0bb Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru 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/broadcom/staging/device-maguro.mk | 7 +- .../broadcom/staging/proprietary/Android.mk | 29 ++++ self-extractors/csr/staging/device-maguro.mk | 9 +- self-extractors/csr/staging/proprietary/Android.mk | 39 ++++++ self-extractors/generate-packages.sh | 5 +- self-extractors/imgtec/staging/device-maguro.mk | 31 ++--- .../imgtec/staging/proprietary/Android.mk | 148 +++++++++++++++++++++ .../invensense/staging/device-maguro.mk | 7 +- .../invensense/staging/proprietary/Android.mk | 29 ++++ self-extractors/nxp/staging/device-maguro.mk | 7 +- self-extractors/nxp/staging/proprietary/Android.mk | 29 ++++ self-extractors/samsung/staging/device-maguro.mk | 11 +- .../samsung/staging/proprietary/Android.mk | 48 +++++++ self-extractors/ti/staging/device-maguro.mk | 7 +- self-extractors/ti/staging/proprietary/Android.mk | 29 ++++ 15 files changed, 383 insertions(+), 52 deletions(-) create mode 100644 self-extractors/broadcom/staging/proprietary/Android.mk create mode 100644 self-extractors/csr/staging/proprietary/Android.mk create mode 100644 self-extractors/imgtec/staging/proprietary/Android.mk create mode 100644 self-extractors/invensense/staging/proprietary/Android.mk create mode 100644 self-extractors/nxp/staging/proprietary/Android.mk create mode 100644 self-extractors/samsung/staging/proprietary/Android.mk create mode 100644 self-extractors/ti/staging/proprietary/Android.mk diff --git a/self-extractors/broadcom/staging/device-maguro.mk b/self-extractors/broadcom/staging/device-maguro.mk index 414c0cf..118c94a 100644 --- a/self-extractors/broadcom/staging/device-maguro.mk +++ b/self-extractors/broadcom/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/broadcom/maguro - # Broadcom blob(s) necessary for Maguro hardware -PRODUCT_COPY_FILES := \ - $(LOCAL_PATH)/proprietary/bcm4330.hcd:system/vendor/firmware/bcm4330.hcd \ - +PRODUCT_PACKAGES := \ + bcm4330 diff --git a/self-extractors/broadcom/staging/proprietary/Android.mk b/self-extractors/broadcom/staging/proprietary/Android.mk new file mode 100644 index 0000000..888c48f --- /dev/null +++ b/self-extractors/broadcom/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 := bcm4330 +LOCAL_MODULE_OWNER := broadcom +LOCAL_SRC_FILES := bcm4330.hcd +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .hcd +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware +include $(BUILD_PREBUILT) + +endif diff --git a/self-extractors/csr/staging/device-maguro.mk b/self-extractors/csr/staging/device-maguro.mk index de44d61..82da534 100644 --- a/self-extractors/csr/staging/device-maguro.mk +++ b/self-extractors/csr/staging/device-maguro.mk @@ -12,10 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH := vendor/csr/maguro - # CSR blob(s) necessary for Maguro hardware -PRODUCT_COPY_FILES := \ - $(LOCAL_PATH)/proprietary/sirfgps.conf:system/vendor/etc/sirfgps.conf \ - $(LOCAL_PATH)/proprietary/gps.omap4.so:system/vendor/lib/hw/gps.omap4.so \ - +PRODUCT_PACKAGES := \ + sirfgps \ + gps.omap4 diff --git a/self-extractors/csr/staging/proprietary/Android.mk b/self-extractors/csr/staging/proprietary/Android.mk new file mode 100644 index 0000000..8083553 --- /dev/null +++ b/self-extractors/csr/staging/proprietary/Android.mk @@ -0,0 +1,39 @@ +# 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 := gps.omap4 +LOCAL_MODULE_OWNER := csr +LOCAL_SRC_FILES := gps.omap4.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/hw +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := sirfgps +LOCAL_MODULE_OWNER := csr +LOCAL_SRC_FILES := sirfgps.conf +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .conf +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc +include $(BUILD_PREBUILT) + +endif diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index 4152344..9228bc1 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -22,8 +22,9 @@ # 238432 = IML74E # 238649 = IML74G # 239410 = IML74K -ZIP=yakju-ota-239410.zip -BUILD=iml74k +# 241580 = IRL89 +ZIP=yakju-ota-241580.zip +BUILD=irl89 ROOTDEVICE=maguro DEVICE=maguro MANUFACTURER=samsung diff --git a/self-extractors/imgtec/staging/device-maguro.mk b/self-extractors/imgtec/staging/device-maguro.mk index 36915cc..fd51db8 100644 --- a/self-extractors/imgtec/staging/device-maguro.mk +++ b/self-extractors/imgtec/staging/device-maguro.mk @@ -12,21 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH := vendor/imgtec/maguro - # Imgtec blob(s) necessary for Maguro hardware -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \ - $(LOCAL_PATH)/proprietary/libEGL_POWERVR_SGX540_120.so:system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \ - $(LOCAL_PATH)/proprietary/libGLESv1_CM_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \ - $(LOCAL_PATH)/proprietary/libGLESv2_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \ - $(LOCAL_PATH)/proprietary/gralloc.omap4.so:system/vendor/lib/hw/gralloc.omap4.so \ - $(LOCAL_PATH)/proprietary/libglslcompiler.so:system/vendor/lib/libglslcompiler.so \ - $(LOCAL_PATH)/proprietary/libIMGegl.so:system/vendor/lib/libIMGegl.so \ - $(LOCAL_PATH)/proprietary/libpvr2d.so:system/vendor/lib/libpvr2d.so \ - $(LOCAL_PATH)/proprietary/libpvrANDROID_WSEGL.so:system/vendor/lib/libpvrANDROID_WSEGL.so \ - $(LOCAL_PATH)/proprietary/libPVRScopeServices.so:system/vendor/lib/libPVRScopeServices.so \ - $(LOCAL_PATH)/proprietary/libsrv_init.so:system/vendor/lib/libsrv_init.so \ - $(LOCAL_PATH)/proprietary/libsrv_um.so:system/vendor/lib/libsrv_um.so \ - $(LOCAL_PATH)/proprietary/libusc.so:system/vendor/lib/libusc.so \ - +PRODUCT_PACKAGES := \ + pvrsrvinit \ + libEGL_POWERVR_SGX540_120 \ + libGLESv1_CM_POWERVR_SGX540_120 \ + libGLESv2_POWERVR_SGX540_120 \ + gralloc.omap4 \ + libglslcompiler \ + libIMGegl \ + libpvr2d \ + libpvrANDROID_WSEGL \ + libPVRScopeServices \ + libsrv_init \ + libsrv_um \ + libusc diff --git a/self-extractors/imgtec/staging/proprietary/Android.mk b/self-extractors/imgtec/staging/proprietary/Android.mk new file mode 100644 index 0000000..68ba039 --- /dev/null +++ b/self-extractors/imgtec/staging/proprietary/Android.mk @@ -0,0 +1,148 @@ +# 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 := pvrsrvinit +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := pvrsrvinit +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libEGL_POWERVR_SGX540_120 +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libEGL_POWERVR_SGX540_120.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libGLESv1_CM_POWERVR_SGX540_120 +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libGLESv1_CM_POWERVR_SGX540_120.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libGLESv2_POWERVR_SGX540_120 +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libGLESv2_POWERVR_SGX540_120.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := gralloc.omap4 +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := gralloc.omap4.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/hw +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libglslcompiler +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libglslcompiler.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libIMGegl +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libIMGegl.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libpvr2d +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libpvr2d.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libpvrANDROID_WSEGL +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libpvrANDROID_WSEGL.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libPVRScopeServices +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libPVRScopeServices.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libsrv_init +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libsrv_init.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libsrv_um +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libsrv_um.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libusc +LOCAL_MODULE_OWNER := imgtec +LOCAL_SRC_FILES := libusc.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +endif diff --git a/self-extractors/invensense/staging/device-maguro.mk b/self-extractors/invensense/staging/device-maguro.mk index 2b7afb0..81986a3 100644 --- a/self-extractors/invensense/staging/device-maguro.mk +++ b/self-extractors/invensense/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/invensense/maguro - # Invensense blob(s) necessary for Maguro hardware -PRODUCT_COPY_FILES := \ - $(LOCAL_PATH)/proprietary/libinvensense_mpl.so:system/vendor/lib/libinvensense_mpl.so \ - +PRODUCT_PACKAGES := \ + libinvensense_mpl diff --git a/self-extractors/invensense/staging/proprietary/Android.mk b/self-extractors/invensense/staging/proprietary/Android.mk new file mode 100644 index 0000000..df7bfb2 --- /dev/null +++ b/self-extractors/invensense/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 := libinvensense_mpl +LOCAL_MODULE_OWNER := invensense +LOCAL_SRC_FILES := libinvensense_mpl.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib +include $(BUILD_PREBUILT) + +endif diff --git a/self-extractors/nxp/staging/device-maguro.mk b/self-extractors/nxp/staging/device-maguro.mk index 96ad6fc..94593f2 100644 --- a/self-extractors/nxp/staging/device-maguro.mk +++ b/self-extractors/nxp/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/nxp/maguro - # NXP blob(s) necessary for Maguro hardware -PRODUCT_COPY_FILES := \ - $(LOCAL_PATH)/proprietary/libpn544_fw.so:system/vendor/firmware/libpn544_fw.so \ - +PRODUCT_PACKAGES := \ + libpn544_fw diff --git a/self-extractors/nxp/staging/proprietary/Android.mk b/self-extractors/nxp/staging/proprietary/Android.mk new file mode 100644 index 0000000..352c466 --- /dev/null +++ b/self-extractors/nxp/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 := libpn544_fw +LOCAL_MODULE_OWNER := nxp +LOCAL_SRC_FILES := libpn544_fw.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware +include $(BUILD_PREBUILT) + +endif diff --git a/self-extractors/samsung/staging/device-maguro.mk b/self-extractors/samsung/staging/device-maguro.mk index 718c496..3f1b7f5 100644 --- a/self-extractors/samsung/staging/device-maguro.mk +++ b/self-extractors/samsung/staging/device-maguro.mk @@ -12,11 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH := vendor/samsung/maguro - # Samsung blob(s) necessary for Maguro hardware -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/proprietary/fRom:system/bin/fRom \ - $(LOCAL_PATH)/proprietary/libsecril-client.so:system/lib/libsecril-client.so \ - $(LOCAL_PATH)/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so \ - +PRODUCT_PACKAGES := \ + fRom \ + libsec-ril \ + libsecril-client diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk new file mode 100644 index 0000000..26c42bc --- /dev/null +++ b/self-extractors/samsung/staging/proprietary/Android.mk @@ -0,0 +1,48 @@ +# 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 := fRom +LOCAL_MODULE_OWNER := samsung +LOCAL_SRC_FILES := fRom +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_PATH := $(TARGET_OUT)/bin +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libsec-ril +LOCAL_MODULE_OWNER := samsung +LOCAL_SRC_FILES := libsec-ril.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := libsecril-client +LOCAL_MODULE_OWNER := samsung +LOCAL_SRC_FILES := libsecril-client.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib +include $(BUILD_PREBUILT) + +endif 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