From bbb0a0cb957527ee0cb2f3276359542755c7fae0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Tue, 3 Jan 2012 10:33:59 -0800 Subject: Rename the makefiles used in self-extractors. That way, devices use the exact same filenames, which can then be fed to diff -r for easy comparisions and updates. Change-Id: Ie6bda29891ef2ace717e5f040efad426806488d6 --- .../broadcom/staging/BoardConfigMaguro.mk | 13 ---------- .../broadcom/staging/BoardConfigPartial.mk | 13 ++++++++++ self-extractors/broadcom/staging/device-maguro.mk | 17 ------------- self-extractors/broadcom/staging/device-partial.mk | 17 +++++++++++++ self-extractors/csr/staging/BoardConfigMaguro.mk | 13 ---------- self-extractors/csr/staging/BoardConfigPartial.mk | 13 ++++++++++ self-extractors/csr/staging/device-maguro.mk | 18 -------------- self-extractors/csr/staging/device-partial.mk | 18 ++++++++++++++ self-extractors/generate-packages.sh | 5 ++-- .../imgtec/staging/BoardConfigMaguro.mk | 13 ---------- .../imgtec/staging/BoardConfigPartial.mk | 13 ++++++++++ self-extractors/imgtec/staging/device-maguro.mk | 29 ---------------------- self-extractors/imgtec/staging/device-partial.mk | 29 ++++++++++++++++++++++ .../invensense/staging/BoardConfigMaguro.mk | 13 ---------- .../invensense/staging/BoardConfigPartial.mk | 13 ++++++++++ .../invensense/staging/device-maguro.mk | 17 ------------- .../invensense/staging/device-partial.mk | 17 +++++++++++++ self-extractors/nxp/staging/BoardConfigMaguro.mk | 13 ---------- self-extractors/nxp/staging/BoardConfigPartial.mk | 13 ++++++++++ self-extractors/nxp/staging/device-maguro.mk | 17 ------------- self-extractors/nxp/staging/device-partial.mk | 17 +++++++++++++ self-extractors/root/BoardConfigVendor.mk | 2 +- self-extractors/root/device-vendor.mk | 2 +- .../samsung/staging/BoardConfigMaguro.mk | 13 ---------- .../samsung/staging/BoardConfigPartial.mk | 13 ++++++++++ self-extractors/samsung/staging/device-maguro.mk | 19 -------------- self-extractors/samsung/staging/device-partial.mk | 19 ++++++++++++++ self-extractors/ti/staging/BoardConfigMaguro.mk | 13 ---------- self-extractors/ti/staging/BoardConfigPartial.mk | 13 ++++++++++ self-extractors/ti/staging/device-maguro.mk | 17 ------------- self-extractors/ti/staging/device-partial.mk | 17 +++++++++++++ 31 files changed, 230 insertions(+), 229 deletions(-) delete mode 100644 self-extractors/broadcom/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/broadcom/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/broadcom/staging/device-maguro.mk create mode 100644 self-extractors/broadcom/staging/device-partial.mk delete mode 100644 self-extractors/csr/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/csr/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/csr/staging/device-maguro.mk create mode 100644 self-extractors/csr/staging/device-partial.mk delete mode 100644 self-extractors/imgtec/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/imgtec/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/imgtec/staging/device-maguro.mk create mode 100644 self-extractors/imgtec/staging/device-partial.mk delete mode 100644 self-extractors/invensense/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/invensense/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/invensense/staging/device-maguro.mk create mode 100644 self-extractors/invensense/staging/device-partial.mk delete mode 100644 self-extractors/nxp/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/nxp/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/nxp/staging/device-maguro.mk create mode 100644 self-extractors/nxp/staging/device-partial.mk delete mode 100644 self-extractors/samsung/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/samsung/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/samsung/staging/device-maguro.mk create mode 100644 self-extractors/samsung/staging/device-partial.mk delete mode 100644 self-extractors/ti/staging/BoardConfigMaguro.mk create mode 100644 self-extractors/ti/staging/BoardConfigPartial.mk delete mode 100644 self-extractors/ti/staging/device-maguro.mk create mode 100644 self-extractors/ti/staging/device-partial.mk (limited to 'self-extractors') diff --git a/self-extractors/broadcom/staging/BoardConfigMaguro.mk b/self-extractors/broadcom/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/broadcom/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/broadcom/staging/BoardConfigPartial.mk b/self-extractors/broadcom/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/broadcom/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/broadcom/staging/device-maguro.mk b/self-extractors/broadcom/staging/device-maguro.mk deleted file mode 100644 index 118c94a..0000000 --- a/self-extractors/broadcom/staging/device-maguro.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2010 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. - -# Broadcom blob(s) necessary for Maguro hardware -PRODUCT_PACKAGES := \ - bcm4330 diff --git a/self-extractors/broadcom/staging/device-partial.mk b/self-extractors/broadcom/staging/device-partial.mk new file mode 100644 index 0000000..118c94a --- /dev/null +++ b/self-extractors/broadcom/staging/device-partial.mk @@ -0,0 +1,17 @@ +# Copyright (C) 2010 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. + +# Broadcom blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + bcm4330 diff --git a/self-extractors/csr/staging/BoardConfigMaguro.mk b/self-extractors/csr/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/csr/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/csr/staging/BoardConfigPartial.mk b/self-extractors/csr/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/csr/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/csr/staging/device-maguro.mk b/self-extractors/csr/staging/device-maguro.mk deleted file mode 100644 index 82da534..0000000 --- a/self-extractors/csr/staging/device-maguro.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2010 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. - -# CSR blob(s) necessary for Maguro hardware -PRODUCT_PACKAGES := \ - sirfgps \ - gps.omap4 diff --git a/self-extractors/csr/staging/device-partial.mk b/self-extractors/csr/staging/device-partial.mk new file mode 100644 index 0000000..82da534 --- /dev/null +++ b/self-extractors/csr/staging/device-partial.mk @@ -0,0 +1,18 @@ +# Copyright (C) 2010 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. + +# CSR blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + sirfgps \ + gps.omap4 diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index 9228bc1..4e89f6d 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -23,8 +23,9 @@ # 238649 = IML74G # 239410 = IML74K # 241580 = IRL89 -ZIP=yakju-ota-241580.zip -BUILD=irl89 +# 241968 = IRM03 +ZIP=yakju-ota-241968.zip +BUILD=irm03 ROOTDEVICE=maguro DEVICE=maguro MANUFACTURER=samsung diff --git a/self-extractors/imgtec/staging/BoardConfigMaguro.mk b/self-extractors/imgtec/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/imgtec/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/imgtec/staging/BoardConfigPartial.mk b/self-extractors/imgtec/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/imgtec/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/imgtec/staging/device-maguro.mk b/self-extractors/imgtec/staging/device-maguro.mk deleted file mode 100644 index fd51db8..0000000 --- a/self-extractors/imgtec/staging/device-maguro.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2010 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. - -# Imgtec blob(s) necessary for Maguro hardware -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/device-partial.mk b/self-extractors/imgtec/staging/device-partial.mk new file mode 100644 index 0000000..fd51db8 --- /dev/null +++ b/self-extractors/imgtec/staging/device-partial.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2010 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. + +# Imgtec blob(s) necessary for Maguro hardware +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/invensense/staging/BoardConfigMaguro.mk b/self-extractors/invensense/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/invensense/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/invensense/staging/BoardConfigPartial.mk b/self-extractors/invensense/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/invensense/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/invensense/staging/device-maguro.mk b/self-extractors/invensense/staging/device-maguro.mk deleted file mode 100644 index 81986a3..0000000 --- a/self-extractors/invensense/staging/device-maguro.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2010 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. - -# Invensense blob(s) necessary for Maguro hardware -PRODUCT_PACKAGES := \ - libinvensense_mpl diff --git a/self-extractors/invensense/staging/device-partial.mk b/self-extractors/invensense/staging/device-partial.mk new file mode 100644 index 0000000..81986a3 --- /dev/null +++ b/self-extractors/invensense/staging/device-partial.mk @@ -0,0 +1,17 @@ +# Copyright (C) 2010 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. + +# Invensense blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + libinvensense_mpl diff --git a/self-extractors/nxp/staging/BoardConfigMaguro.mk b/self-extractors/nxp/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/nxp/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/nxp/staging/BoardConfigPartial.mk b/self-extractors/nxp/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/nxp/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/nxp/staging/device-maguro.mk b/self-extractors/nxp/staging/device-maguro.mk deleted file mode 100644 index 94593f2..0000000 --- a/self-extractors/nxp/staging/device-maguro.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2010 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. - -# NXP blob(s) necessary for Maguro hardware -PRODUCT_PACKAGES := \ - libpn544_fw diff --git a/self-extractors/nxp/staging/device-partial.mk b/self-extractors/nxp/staging/device-partial.mk new file mode 100644 index 0000000..94593f2 --- /dev/null +++ b/self-extractors/nxp/staging/device-partial.mk @@ -0,0 +1,17 @@ +# Copyright (C) 2010 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. + +# NXP blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + libpn544_fw diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk index b685549..ca10d74 100644 --- a/self-extractors/root/BoardConfigVendor.mk +++ b/self-extractors/root/BoardConfigVendor.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := maguro/BoardConfigMaguro.mk +LOCAL_STEM := maguro/BoardConfigPartial.mk -include vendor/broadcom/$(LOCAL_STEM) -include vendor/csr/$(LOCAL_STEM) diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk index c266dda..833cbcd 100644 --- a/self-extractors/root/device-vendor.mk +++ b/self-extractors/root/device-vendor.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := maguro/device-maguro.mk +LOCAL_STEM := maguro/device-partial.mk $(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM)) $(call inherit-product-if-exists, vendor/csr/$(LOCAL_STEM)) diff --git a/self-extractors/samsung/staging/BoardConfigMaguro.mk b/self-extractors/samsung/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/samsung/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/samsung/staging/BoardConfigPartial.mk b/self-extractors/samsung/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/samsung/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/samsung/staging/device-maguro.mk b/self-extractors/samsung/staging/device-maguro.mk deleted file mode 100644 index 3f1b7f5..0000000 --- a/self-extractors/samsung/staging/device-maguro.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2010 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. - -# Samsung blob(s) necessary for Maguro hardware -PRODUCT_PACKAGES := \ - fRom \ - libsec-ril \ - libsecril-client diff --git a/self-extractors/samsung/staging/device-partial.mk b/self-extractors/samsung/staging/device-partial.mk new file mode 100644 index 0000000..3f1b7f5 --- /dev/null +++ b/self-extractors/samsung/staging/device-partial.mk @@ -0,0 +1,19 @@ +# Copyright (C) 2010 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. + +# Samsung blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + fRom \ + libsec-ril \ + libsecril-client diff --git a/self-extractors/ti/staging/BoardConfigMaguro.mk b/self-extractors/ti/staging/BoardConfigMaguro.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/ti/staging/BoardConfigMaguro.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2010 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. diff --git a/self-extractors/ti/staging/BoardConfigPartial.mk b/self-extractors/ti/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/ti/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 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. diff --git a/self-extractors/ti/staging/device-maguro.mk b/self-extractors/ti/staging/device-maguro.mk deleted file mode 100644 index 427009b..0000000 --- a/self-extractors/ti/staging/device-maguro.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2010 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. - -# TI blob(s) necessary for Maguro hardware -PRODUCT_PACKAGES := \ - ducati-m3 diff --git a/self-extractors/ti/staging/device-partial.mk b/self-extractors/ti/staging/device-partial.mk new file mode 100644 index 0000000..427009b --- /dev/null +++ b/self-extractors/ti/staging/device-partial.mk @@ -0,0 +1,17 @@ +# Copyright (C) 2010 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. + +# TI blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + ducati-m3 -- cgit v1.1