omnirom · fakedfaker · Sep 24, 2013
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
@@ -15,4 +15,5 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_i9300.mk
+    $(LOCAL_DIR)/aosp_i9300.mk \
+    $(LOCAL_DIR)/custom_i9300.mk
diff --git a/aosp_i9300.mk b/aosp_i9300.mk
@@ -0,0 +1,3 @@
+$(call inherit-product, device/samsung/i9300/full_i9300.mk)
+
+PRODUCT_NAME := aosp_i9300
diff --git a/cm.dependencies b/cm.dependencies
diff --git a/cm.mk b/cm.mk
diff --git a/custom_i9300.mk b/custom_i9300.mk
@@ -0,0 +1,31 @@
+# Copyright (C) 2013 OmniROM Project
+# Copyright (C) 2012 The CyanogenMod 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.
+
+# Inherit from the common Open Source product configuration
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/custom/config/common.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/i9300/device.mk)
+
+# Discard inherited values and use our own instead.
+PRODUCT_NAME := custom_i9300
+PRODUCT_DEVICE := i9300
+PRODUCT_BRAND := samsung
+PRODUCT_MANUFACTURER := Samsung
+PRODUCT_MODEL := GT-I9300
diff --git a/i9300.mk → device.mk b/i9300.mk → device.mk
@@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \
 
 # Audio
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m0
+    $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/i9300
 
 # Camera
 PRODUCT_PACKAGES += \
@@ -54,7 +54,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libsecril-client \
     libsecril-client-sap \
-    SamsungServiceMode \
     tinyplay
 
 # NFC
@@ -83,8 +82,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     com.android.nfc_extras
 
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
 # RIL
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.ril_class=SamsungExynos4RIL \

diff --git a/full_i9300.mk b/full_i9300.mk
@@ -1,3 +1,4 @@
+# Copyright (C) 2013 OmniROM Project
 # Copyright (C) 2012 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,24 +13,16 @@
 # 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 toro hardware. This cleanly combines a set of
-# device-specific aspects (drivers) with a device-agnostic
-# product configuration (apps). Except for a few implementation
-# details, it only fundamentally contains two inherit-product
-# lines, full and toro, hence its name.
-#
+# Inherit from the common Open Source product configuration
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.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/i9300/i9300.mk)
+$(call inherit-product, device/samsung/i9300/device.mk)
 
 # Discard inherited values and use our own instead.
 PRODUCT_NAME := full_i9300
 PRODUCT_DEVICE := i9300
 PRODUCT_BRAND := samsung
-PRODUCT_MANUFACTURER := samsung
+PRODUCT_MANUFACTURER := Samsung
 PRODUCT_MODEL := GT-I9300
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -183,10 +183,10 @@
     <bool name="config_intrusiveNotificationLed">true</bool>
 
     <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
-    <bool name="config_intrusiveBatteryLed">true</bool>
+    <!-- <bool name="config_intrusiveBatteryLed">true</bool> -->
 
     <!-- Does the battery LED support multiple colors? Used to decide if the user can change the colors -->
-    <bool name="config_multiColorBatteryLed">true</bool>
+    <!-- <bool name="config_multiColorBatteryLed">true</bool> -->
 
     <!-- Default color for notification LED is white. -->
     <color name="config_defaultNotificationColor">#ffffffff</color>
@@ -204,7 +204,7 @@
     <bool name="config_disableHomeUnlockSetting">false</bool>
 
     <!-- Workaround for devices with broken keyboards -->
-    <bool name="config_forceDisableHardwareKeyboard">true</bool>
+    <!-- <bool name="config_forceDisableHardwareKeyboard">true</bool> -->
 
     <!-- Hardware 'face' keys present on the device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
@@ -216,9 +216,9 @@
             16 - App switch
          For example, a device with Home, Back and Menu keys would set this
          config to 7. -->
-    <integer name="config_deviceHardwareKeys">7</integer>
+    <!-- <integer name="config_deviceHardwareKeys">7</integer> -->
 
     <!-- Boolean to enable stk functionality on Samsung phones -->
-    <bool name="config_samsung_stk">true</bool>
+    <!-- <bool name="config_samsung_stk">true</bool> -->
 
 </resources>
diff --git a/overlay/packages/apps/Phone/res/values/config.xml b/overlay/packages/apps/Phone/res/values/config.xml
@@ -21,5 +21,5 @@
     <bool name="has_in_call_noise_suppression">true</bool>
 
     <!-- Audio parameter for setting noise suppression-->
-    <string name="in_call_noise_suppression_audioparameter">noise_suppression=true=false</string>
+    <!-- <string name="in_call_noise_suppression_audioparameter">noise_suppression=true=false</string> -->
 </resources>
diff --git a/selinux/file_contexts b/selinux/file_contexts
@@ -4,7 +4,7 @@
 /dev/fimg2d                             u:object_r:mali_device:s0
 
 # NFC
-/dev/pn544                              u:object_r:nfc_device:s0
+# /dev/pn544                              u:object_r:nfc_device:s0
 
 # RIL
 /dev/umts_boot0                         u:object_r:radio_device:s0

diff --git a/selinux/system.te b/selinux/system.te
@@ -1,4 +1,4 @@
-allow system uinput_device:chr_file { read ioctl write open };
+# allow system uinput_device:chr_file { read ioctl write open };
 allow system sensors_device:chr_file { read open };
 allow system sensors_data_file:file r_file_perms;
 allow system wpa_socket:unix_dgram_socket sendto;

diff --git a/vendorsetup.sh b/vendorsetup.sh
@@ -0,0 +1,2 @@
+add_lunch_combo full_i9300-userdebug
+add_lunch_combo custom_i9300-userdebug