diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-19 19:59:07 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-19 19:59:07 -0700 |
commit | 031a2615b30ed9fb132058d011e9ca52ac9d9a55 (patch) | |
tree | c242c9a285733fdf6833bee13559bb094a255042 | |
parent | 3de8f4709a02c189aa7c99cd3ca337c401cfdee7 (diff) | |
download | device_samsung_crespo-031a2615b30ed9fb132058d011e9ca52ac9d9a55.zip device_samsung_crespo-031a2615b30ed9fb132058d011e9ca52ac9d9a55.tar.gz device_samsung_crespo-031a2615b30ed9fb132058d011e9ca52ac9d9a55.tar.bz2 |
Improve crespo relationship with open-source
-add a proper device.mk where open-source drivers can be added
-add skeletons for extract-files.sh and unzip-files.sh
-add a full_crespo config: the full open-source config on crespo
Change-Id: I9de3afc372974225c3f892f776d3b418c3ba8213
-rwxr-xr-x | AndroidProducts.mk | 1 | ||||
-rw-r--r-- | CleanSpec.mk | 49 | ||||
-rw-r--r-- | device.mk | 14 | ||||
-rw-r--r-- | extract-files.sh | 52 | ||||
-rw-r--r-- | full_crespo.mk | 32 | ||||
-rw-r--r-- | unzip-files.sh | 52 | ||||
-rw-r--r-- | vendorsetup.sh | 23 |
7 files changed, 223 insertions, 0 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 0d43a56..8a17518 100755 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -26,4 +26,5 @@ # PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/full_crespo.mk \ $(LOCAL_DIR)/crespo.mk diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..b84e1b6 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,49 @@ +# Copyright (C) 2007 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. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ diff --git a/device.mk b/device.mk new file mode 100644 index 0000000..ea11401 --- /dev/null +++ b/device.mk @@ -0,0 +1,14 @@ +# 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/extract-files.sh b/extract-files.sh new file mode 100644 index 0000000..d101152 --- /dev/null +++ b/extract-files.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# 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. + +# This file is generated by device/common/generate-blob-scripts.sh - DO NOT EDIT + +DEVICE=crespo +MANUFACTURER=samsung + +mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary +adb pull /system/lib/libgips.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libgips.so +adb pull /system/lib/libjingle.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libjingle.so +adb pull /system/lib/liblvmxipc.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/liblvmxipc.so + +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/$DEVICE-vendor-blobs.mk +# 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. + +# This file is generated by device/__MANUFACTURER__/__DEVICE__/extract-files.sh - DO NOT EDIT + + +# All the blobs necessary for crespo +PRODUCT_COPY_FILES += \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgips.so:system/lib/libgips.so \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/libjingle.so:system/lib/libjingle.so \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/liblvmxipc.so:system/lib/liblvmxipc.so +EOF + +./setup-makefiles.sh diff --git a/full_crespo.mk b/full_crespo.mk new file mode 100644 index 0000000..67c025a --- /dev/null +++ b/full_crespo.mk @@ -0,0 +1,32 @@ +# Copyright (C) 2009 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. + +# +# This file is the build configuration for a full Android +# build for passion hardware. This cleanly combines a set of +# device-specific aspects (drivers) with a device-agnostic +# product configuration (apps). +# + +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) +# This is where we'd set a backup provider if we had one +#$(call inherit-product, device/sample/products/backup_overlay.mk) +$(call inherit-product, device/samsung/crespo/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk) + +# Discard inherited values and use our own instead. +PRODUCT_NAME := full_crespo +PRODUCT_DEVICE := crespo +PRODUCT_MODEL := Full Android on Crespo diff --git a/unzip-files.sh b/unzip-files.sh new file mode 100644 index 0000000..242d05d --- /dev/null +++ b/unzip-files.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# 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. + +# This file is generated by device/common/generate-blob-scripts.sh - DO NOT EDIT + +DEVICE=crespo +MANUFACTURER=samsung + +mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary +unzip -j -o ../../../${DEVICE}_update.zip system/lib/libgips.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary +unzip -j -o ../../../${DEVICE}_update.zip system/lib/libjingle.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary +unzip -j -o ../../../${DEVICE}_update.zip system/lib/liblvmxipc.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary + +(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/$DEVICE-vendor-blobs.mk +# 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. + +# This file is generated by device/__MANUFACTURER__/__DEVICE__/unzip-files.sh - DO NOT EDIT + + +# All the blobs necessary for crespo +PRODUCT_COPY_FILES += \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/libgips.so:system/lib/libgips.so \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/libjingle.so:system/lib/libjingle.so \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/liblvmxipc.so:system/lib/liblvmxipc.so +EOF + +./setup-makefiles.sh diff --git a/vendorsetup.sh b/vendorsetup.sh new file mode 100644 index 0000000..f5faebf --- /dev/null +++ b/vendorsetup.sh @@ -0,0 +1,23 @@ +# +# 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. +# + +# This file is executed by build/envsetup.sh, and can use anything +# defined in envsetup.sh. +# +# In particular, you can add lunch options with the add_lunch_combo +# function: add_lunch_combo generic-eng + +add_lunch_combo full_crespo-userdebug |