clean up proprietaries
no need to include kernel modules anymore since we have built/included
them from source
no need to include the .xml/.jar files since we don't use them anymore
no need to have the libOMX stuff in here since we build them from source
no need to have audiopolicy since we build it from source
had to change the fw_wlan1271.bin firmware file to get the wifi driver
working as expected
diff --git a/sholes/proprietary/act_mirred.ko b/sholes/proprietary/act_mirred.ko
deleted file mode 100644
index 429e697..0000000
--- a/sholes/proprietary/act_mirred.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/act_police.ko b/sholes/proprietary/act_police.ko
deleted file mode 100644
index d1eada2..0000000
--- a/sholes/proprietary/act_police.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/android.hardware.telephony.cdma.xml b/sholes/proprietary/android.hardware.telephony.cdma.xml
deleted file mode 100644
index 082378d..0000000
--- a/sholes/proprietary/android.hardware.telephony.cdma.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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 is the standard set of telephony features for a CDMA phone. -->
-<permissions>
- <feature name="android.hardware.telephony" />
- <feature name="android.hardware.telephony.cdma" />
-</permissions>
diff --git a/sholes/proprietary/android.hardware.touchscreen.multitouch.distinct.xml b/sholes/proprietary/android.hardware.touchscreen.multitouch.distinct.xml
deleted file mode 100644
index a3c116a..0000000
--- a/sholes/proprietary/android.hardware.touchscreen.multitouch.distinct.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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 is the standard set of features for a touchscreen that supports
- independently-trackable multiple-finger multitouch. -->
-<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
-</permissions>
diff --git a/sholes/proprietary/cls_u32.ko b/sholes/proprietary/cls_u32.ko
deleted file mode 100644
index 203d5a6..0000000
--- a/sholes/proprietary/cls_u32.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/com.google.android.maps.jar b/sholes/proprietary/com.google.android.maps.jar
deleted file mode 100644
index ef1cf3a..0000000
--- a/sholes/proprietary/com.google.android.maps.jar
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/com.google.android.maps.xml b/sholes/proprietary/com.google.android.maps.xml
deleted file mode 100644
index 5be5c2c..0000000
--- a/sholes/proprietary/com.google.android.maps.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<permissions>
- <library name="com.google.android.maps"
- file="/system/framework/com.google.android.maps.jar" />
-</permissions>
diff --git a/sholes/proprietary/em_u32.ko b/sholes/proprietary/em_u32.ko
deleted file mode 100644
index 2d40efa..0000000
--- a/sholes/proprietary/em_u32.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/features.xml b/sholes/proprietary/features.xml
deleted file mode 100644
index 4f8d1f0..0000000
--- a/sholes/proprietary/features.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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 is the standard set of features for an auto-focus camera. -->
-<permissions>
- <feature name="com.google.android.feature.GOOGLE_BUILD" />
-</permissions>
-
diff --git a/sholes/proprietary/fw_wlan1271.bin b/sholes/proprietary/fw_wlan1271.bin
index 1c397a4..9969b5e 100644
--- a/sholes/proprietary/fw_wlan1271.bin
+++ b/sholes/proprietary/fw_wlan1271.bin
Binary files differ
diff --git a/sholes/proprietary/ifb.ko b/sholes/proprietary/ifb.ko
deleted file mode 100644
index 8089a43..0000000
--- a/sholes/proprietary/ifb.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX.TI.AAC.encode.so b/sholes/proprietary/libOMX.TI.AAC.encode.so
deleted file mode 100644
index c0a2103..0000000
--- a/sholes/proprietary/libOMX.TI.AAC.encode.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX.TI.AMR.decode.so b/sholes/proprietary/libOMX.TI.AMR.decode.so
deleted file mode 100644
index a806e40..0000000
--- a/sholes/proprietary/libOMX.TI.AMR.decode.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX.TI.JPEG.Encoder.so b/sholes/proprietary/libOMX.TI.JPEG.Encoder.so
deleted file mode 100644
index bd13f29..0000000
--- a/sholes/proprietary/libOMX.TI.JPEG.Encoder.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX.TI.Video.Decoder.so b/sholes/proprietary/libOMX.TI.Video.Decoder.so
deleted file mode 100644
index 7146474..0000000
--- a/sholes/proprietary/libOMX.TI.Video.Decoder.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX.TI.Video.encoder.so b/sholes/proprietary/libOMX.TI.Video.encoder.so
deleted file mode 100644
index 0acdff6..0000000
--- a/sholes/proprietary/libOMX.TI.Video.encoder.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX.TI.WBAMR.encode.so b/sholes/proprietary/libOMX.TI.WBAMR.encode.so
deleted file mode 100644
index e600c9f..0000000
--- a/sholes/proprietary/libOMX.TI.WBAMR.encode.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libOMX_Core.so b/sholes/proprietary/libOMX_Core.so
deleted file mode 100644
index 14257c1..0000000
--- a/sholes/proprietary/libOMX_Core.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/libaudiopolicy.so b/sholes/proprietary/libaudiopolicy.so
deleted file mode 100644
index de6e54e..0000000
--- a/sholes/proprietary/libaudiopolicy.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/lights.sholes.so b/sholes/proprietary/lights.sholes.so
deleted file mode 100644
index da41e18..0000000
--- a/sholes/proprietary/lights.sholes.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/overlay.omap3.so b/sholes/proprietary/overlay.omap3.so
deleted file mode 100644
index 994c3ba..0000000
--- a/sholes/proprietary/overlay.omap3.so
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/sch_htb.ko b/sholes/proprietary/sch_htb.ko
deleted file mode 100644
index 1e7d9ef..0000000
--- a/sholes/proprietary/sch_htb.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/sch_ingress.ko b/sholes/proprietary/sch_ingress.ko
deleted file mode 100644
index 0e4e21c..0000000
--- a/sholes/proprietary/sch_ingress.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/proprietary/wl127x_test.ko b/sholes/proprietary/wl127x_test.ko
deleted file mode 100644
index 1ec6abb..0000000
--- a/sholes/proprietary/wl127x_test.ko
+++ /dev/null
Binary files differ
diff --git a/sholes/sholes-vendor-blobs.mk b/sholes/sholes-vendor-blobs.mk
index df308c3..5102adb 100644
--- a/sholes/sholes-vendor-blobs.mk
+++ b/sholes/sholes-vendor-blobs.mk
@@ -19,11 +19,9 @@
vendor/motorola/sholes/proprietary/libmoto_gps.so:obj/lib/libmoto_gps.so \
vendor/motorola/sholes/proprietary/libcamera.so:obj/lib/libcamera.so \
vendor/motorola/sholes/proprietary/libaudio.so:obj/lib/libaudio.so \
- vendor/motorola/sholes/proprietary/libaudiopolicy.so:obj/lib/libaudiopolicy.so \
vendor/motorola/sholes/proprietary/libril_rds.so:obj/lib/libril_rds.so \
vendor/motorola/sholes/proprietary/libnmea.so:obj/lib/libnmea.so \
vendor/motorola/sholes/proprietary/gralloc.omap3.so:obj/lib/hw/gralloc.omap3.so \
- vendor/motorola/sholes/proprietary/lights.sholes.so:obj/lib/hw/lights.sholes.so
PRODUCT_COPY_FILES += \
vendor/motorola/sholes/proprietary/ProgramMenuSystem.apk:/system/app/ProgramMenuSystem.apk \
@@ -35,14 +33,12 @@
vendor/motorola/sholes/proprietary/libmoto_gps.so:/system/lib/libmoto_gps.so \
vendor/motorola/sholes/proprietary/libcamera.so:/system/lib/libcamera.so \
vendor/motorola/sholes/proprietary/libaudio.so:/system/lib/libaudio.so \
- vendor/motorola/sholes/proprietary/libaudiopolicy.so:/system/lib/libaudiopolicy.so \
vendor/motorola/sholes/proprietary/libril_rds.so:/system/lib/libril_rds.so \
vendor/motorola/sholes/proprietary/libnmea.so:/system/lib/libnmea.so \
vendor/motorola/sholes/proprietary/libEGL_POWERVR_SGX530_121.so:/system/lib/egl/libEGL_POWERVR_SGX530_121.so \
vendor/motorola/sholes/proprietary/libGLESv1_CM_POWERVR_SGX530_121.so:/system/lib/egl/libGLESv1_CM_POWERVR_SGX530_121.so \
vendor/motorola/sholes/proprietary/libGLESv2_POWERVR_SGX530_121.so:/system/lib/egl/libGLESv2_POWERVR_SGX530_121.so \
vendor/motorola/sholes/proprietary/gralloc.omap3.so:/system/lib/hw/gralloc.omap3.so \
- vendor/motorola/sholes/proprietary/lights.sholes.so:/system/lib/hw/lights.sholes.so \
vendor/motorola/sholes/proprietary/libbattd.so:/system/lib/libbattd.so \
vendor/motorola/sholes/proprietary/libglslcompiler.so:/system/lib/libglslcompiler.so \
vendor/motorola/sholes/proprietary/libHPImgApi.so:/system/lib/libHPImgApi.so \
@@ -109,14 +105,6 @@
vendor/motorola/sholes/proprietary/wbamrenc_sn.dll64P:/system/lib/dsp/wbamrenc_sn.dll64P \
vendor/motorola/sholes/proprietary/wmadec_sn.dll64P:/system/lib/dsp/wmadec_sn.dll64P \
vendor/motorola/sholes/proprietary/wmv9dec_sn.dll64P:/system/lib/dsp/wmv9dec_sn.dll64P \
- vendor/motorola/sholes/proprietary/act_mirred.ko:/system/lib/modules/act_mirred.ko \
- vendor/motorola/sholes/proprietary/act_police.ko:/system/lib/modules/act_police.ko \
- vendor/motorola/sholes/proprietary/cls_u32.ko:/system/lib/modules/cls_u32.ko \
- vendor/motorola/sholes/proprietary/em_u32.ko:/system/lib/modules/em_u32.ko \
- vendor/motorola/sholes/proprietary/ifb.ko:/system/lib/modules/ifb.ko \
- vendor/motorola/sholes/proprietary/sch_htb.ko:/system/lib/modules/sch_htb.ko \
- vendor/motorola/sholes/proprietary/sch_ingress.ko:/system/lib/modules/sch_ingress.ko \
- vendor/motorola/sholes/proprietary/wl127x_test.ko:/system/lib/modules/wl127x_test.ko \
vendor/motorola/sholes/proprietary/de-DE_gl0_sg.bin:/system/tts/lang_pico/de-DE_gl0_sg.bin \
vendor/motorola/sholes/proprietary/de-DE_ta.bin:/system/tts/lang_pico/de-DE_ta.bin \
vendor/motorola/sholes/proprietary/en-GB_kh0_sg.bin:/system/tts/lang_pico/en-GB_kh0_sg.bin \
