summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-03-25 18:01:49 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-03-25 18:01:49 -0700
commit7320f23eae7581be22382e24ac26e7dc9c85e06c (patch)
tree5361f4beb80d7ef29f8963d615a11769c5bfb2c9
parent8e83b44db4dda3ace1ac75b0481b703f8cfee11d (diff)
downloadsapphire-7320f23eae7581be22382e24ac26e7dc9c85e06c.tar.gz
Separate scripts that handle blobs.
This opens the door for the blob-handling scripts to be auto-generated, whereas another large part of the files being copied to vendor/ isn't a good candidate for auto-generation. Bug: 1869158 Change-Id: I86614b5d31a28f04e5416179d9717b78805ad8c6
-rwxr-xr-xextract-files.sh24
-rwxr-xr-xsetup-makefiles.sh61
2 files changed, 63 insertions, 22 deletions
diff --git a/extract-files.sh b/extract-files.sh
index 658a3d8..80cf75d 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -42,7 +42,7 @@ adb pull /system/lib/libopencorehw.so ../../../vendor/htc/$DEVICE/proprietary/li
adb pull /system/lib/libqcomm_omx.so ../../../vendor/htc/$DEVICE/proprietary/libqcomm_omx.so
adb pull /system/lib/libstagefrighthw.so ../../../vendor/htc/$DEVICE/proprietary/libstagefrighthw.so
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/device_$DEVICE-vendor.mk
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/device_$DEVICE-vendor-blobs.mk
# Copyright (C) 2010 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,24 +89,4 @@ PRODUCT_COPY_FILES += \\
vendor/htc/__DEVICE__/proprietary/libstagefrighthw.so:system/lib/libstagefrighthw.so
EOF
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/BoardConfigVendor.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/htc/__DEVICE__/extract-files.sh
-
-BOARD_GPS_LIBRARIES := libgps
-
-USE_CAMERA_STUB := false
-EOF
+./setup-makefiles.sh
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
new file mode 100755
index 0000000..0e558e4
--- /dev/null
+++ b/setup-makefiles.sh
@@ -0,0 +1,61 @@
+#!/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.
+
+DEVICE=sapphire
+
+mkdir -p ../../../vendor/htc/$DEVICE
+
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/device_$DEVICE-vendor.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/htc/__DEVICE__/setup-makefiles.sh
+
+\$(call inherit-product, vendor/htc/__DEVICE__/device___DEVICE__-vendor-blobs.mk)
+EOF
+
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g > ../../../vendor/htc/$DEVICE/BoardConfigVendor.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/htc/__DEVICE__/setup-makefiles.sh
+
+BOARD_GPS_LIBRARIES := libgps
+
+USE_CAMERA_STUB := false
+EOF