Merge commit '4a0eb239e802bc20c2d2101217170879440b8e99' into HEAD

Conflicts: BoardConfig.mk CleanSpec.mk device-common.mk factory-images/generate-factory-images-package.sh full_grouper.mk init.grouper.rc kernel media_codecs.xml self-extractors/generate-packages.sh self-extractors/nvidia/staging/keymaster/Android.mk self-extractors/nxp/LICENSE sepolicy/app.te sepolicy/btmacreader.te sepolicy/device.te sepolicy/file.te sepolicy/file_contexts sepolicy/sensors_config.te sepolicy/surfaceflinger.te sepolicy/system.te Change-Id: I9a32a731651ee6d02e347c7aef3b68d609710561
LineageOS · Nov 8, 2013 · 2312cea · 2312cea
1 parent cb0fe36
commit 2312cea
Show file tree

Hide file tree

Showing 41 changed files with 3,268 additions and 996 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -31,7 +31,7 @@
 USE_CAMERA_STUB := true
 USE_PROPRIETARY_AUDIO_EXTENSIONS := false
 
-BOARD_LIB_DUMPSTATE := libdumpstate.grouper
+BOARD_HAL_STATIC_LIBRARIES := libdumpstate.grouper
 
 TARGET_RECOVERY_UI_LIB := librecovery_ui_grouper
 RECOVERY_FSTAB_VERSION := 2
@@ -42,3 +42,22 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/asus/grouper
 include device/asus/grouper/BoardConfigCommon.mk
 
 TARGET_RECOVERY_FSTAB = device/asus/grouper/fstab.grouper
+
+BOARD_SEPOLICY_DIRS := \
+        device/asus/grouper/sepolicy
+
+BOARD_SEPOLICY_UNION := \
+        file_contexts \
+        genfs_contexts \
+        app.te \
+        btmacreader.te \
+        device.te \
+        drmserver.te \
+        init_shell.te \
+        file.te \
+        rild.te \
+        sensors_config.te \
+        shell.te \
+        surfaceflinger.te \
+        system.te \
+        zygote.te
diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -48,4 +48,5 @@
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(TARGET_OUT)/etc/permissions/android.hardware.bluetooth_le.xml)
diff --git a/audio_policy.conf b/audio_policy.conf
@@ -5,7 +5,7 @@
 global_configuration {
   attached_output_devices AUDIO_DEVICE_OUT_SPEAKER
   default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX
 }
 
 # audio hardware module section: contains descriptors for all audio hw modules present on the
@@ -65,4 +65,22 @@ audio_hw_modules {
       }
     }
   }
+  r_submix {
+    outputs {
+      submix {
+        sampling_rates 44100|48000
+        channel_masks AUDIO_CHANNEL_OUT_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX
+      }
+    }
+    inputs {
+      submix {
+        sampling_rates 44100|48000
+        channel_masks AUDIO_CHANNEL_IN_STEREO
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_IN_REMOTE_SUBMIX
+      }
+    }
+  }
 }
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
@@ -25,7 +25,9 @@
 #define BTA_DM_COD {0x1A, 0x01, 0x14}
 
 #define BTIF_HF_SERVICES (BTA_HSP_SERVICE_MASK)
-#define BTIF_HF_SERVICE_NAMES  { BTIF_HSAG_SERVICE_NAME }
+#define BTIF_HF_SERVICE_NAMES  { BTIF_HSAG_SERVICE_NAME, NULL }
 #define PAN_NAP_DISABLED TRUE
-
+#define BLE_INCLUDED FALSE
+#define BTA_GATT_INCLUDED FALSE
+#define SMP_INCLUDED FALSE
 #endif
diff --git a/device-common.mk b/device-common.mk
@@ -73,6 +73,7 @@ PRODUCT_PACKAGES := \
     power.grouper \
     audio.a2dp.default \
     audio.usb.default \
+    audio.r_submix.default \
     librs_jni \
     setup_fs \
     l2ping \
@@ -103,10 +104,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     device/asus/grouper/media_codecs.xml:system/etc/media_codecs.xml
 
-# Bluetooth config file
-PRODUCT_COPY_FILES += \
-    system/bluetooth/data/main.nonsmartphone.conf:system/etc/bluetooth/main.conf \
-
 # audio mixer paths
 PRODUCT_COPY_FILES += \
     device/asus/grouper/mixer_paths.xml:system/etc/mixer_paths.xml

diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011 The Android Open Source Project
+# Copyright 2011 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.
@@ -33,16 +33,29 @@
 # 526897 = JOP39B
 # 527221 = JOP40
 # 527662 = JOP40C
+# 533553 = JOP40D
 # end jb-mr1-dev
+# start jb-mr1.1-dev
+# 551245 = JDP82
+# 573038 = JDQ39
+# end jb-mr1.1-dev
+# start jb-mr2-dev
+# 683083 = JWR51
+# 689345 = JWR58
+# 690834 = JWR59
+# 704243 = JWR66G
+# 711294 = JWR66N
+# 737497 = JWR66V
+# end jb-mr2-dev
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=527662
+BUILD=737497
 DEVICE=grouper
 PRODUCT=nakasi
-VERSION=jop40c
+VERSION=jwr66v
 SRCPREFIX=signed-
 BOOTLOADERFILE=bootloader.bin
-BOOTLOADER=4.13
+BOOTLOADER=4.23
 SLEEPDURATION=10
 UNLOCKBOOTLOADER=true
 ERASEALL=true

diff --git a/full_grouper.mk b/full_grouper.mk
@@ -31,4 +31,4 @@ PRODUCT_DEVICE := grouper
 PRODUCT_BRAND := Android
 # Don't restrict vendor folder
 PRODUCT_RESTRICT_VENDOR_FILES := false
-PRODUCT_MODEL := AOSP on Grouper
+PRODUCT_MODEL := CyanogenMod on Grouper
diff --git a/init.grouper.rc b/init.grouper.rc
@@ -316,7 +316,8 @@ on boot
 service wpa_supplicant /system/bin/wpa_supplicant \
     -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
     -I/system/etc/wifi/wpa_supplicant_overlay.conf \
-    -e/data/misc/wifi/entropy.bin
+    -O/data/misc/wifi/sockets \
+    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
     #   we will start as root and wpa_supplicant will switch to user wifi
     #   after setting up the capabilities required for WEXT
     #   user wifi
@@ -328,10 +329,12 @@ service wpa_supplicant /system/bin/wpa_supplicant \
 
 service p2p_supplicant /system/bin/wpa_supplicant \
     -iwlan0 -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \
-    -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf \
     -I/system/etc/wifi/wpa_supplicant_overlay.conf \
-    -e/data/misc/wifi/entropy.bin -puse_p2p_group_interface=1
+    -O/data/misc/wifi/sockets -N \
+    -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf \
+    -I/system/etc/wifi/p2p_supplicant_overlay.conf \
+    -puse_p2p_group_interface=1 -e/data/misc/wifi/entropy.bin \
+    -g@android:wpa_wlan0
 #   we will start as root and wpa_supplicant will switch to user wifi
 #   after setting up the capabilities required for WEXT
 #   user wifi
@@ -389,7 +392,7 @@ service iprenew_bt-pan /system/bin/dhcpcd -n
 #Sensor load calibration files end
 
 # virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
+service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
     class late_start
 
 # bugreport is triggered by the VOLUME-DOWN and VOLUME-UP keys

diff --git a/media_codecs.xml b/media_codecs.xml
@@ -95,7 +95,8 @@ Only the three quirks included above are recognized at this point:
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
-        <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
+        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" />
+        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" />
     </Decoders>
 
     <Encoders>
@@ -107,6 +108,6 @@ Only the three quirks included above are recognized at this point:
         <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
         <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
         <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
-        <MediaCodec name="OMX.google.vpx.encoder" type="video/x-vnd.on2.vp8" />
+        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" />
     </Encoders>
 </MediaCodecs>
diff --git a/self-extractors/asus/COPYRIGHT b/self-extractors/asus/COPYRIGHT
@@ -1 +1 @@
-# (C) ASUS. All Rights Reserved.
+# (C) ASUSTek COMPUTER INC.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		# (C) ASUS. All Rights Reserved.
		# (C) ASUSTek COMPUTER INC.