Minor fixes for other build environments

Author: Dees-Troy

BoardConfig.mk

@@ -1,46 +1,47 @@
-USE_CAMERA_STUB := true
-
-# inherit from the proprietary version
--include vendor/emulator/twrp/BoardConfigVendor.mk
-
-TARGET_NO_BOOTLOADER := true
-TARGET_BOOTLOADER_BOARD_NAME := twrp
-
-# Platform
-TARGET_NO_RADIOIMAGE := true
-TARGET_BOARD_PLATFORM := omap4
-
-# Architecture
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGET_CPU_SMP := true
-TARGET_ARCH_VARIANT := armv7-a-neon
-ARCH_ARM_HAVE_TLS_REGISTER := true
-
-BOARD_KERNEL_BASE := 0x80000000
-# BOARD_KERNEL_CMDLINE :=
-
-BOARD_BOOTIMAGE_PARTITION_SIZE := 0x105c0000
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x105c0000
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x105c0000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x105c0000
-BOARD_FLASH_BLOCK_SIZE := 131072
-
-TARGET_PREBUILT_KERNEL := device/emulator/twrp/kernAl
-
-# Recovery:Start
-
-# Use this flag if the board has a ext4 partition larger than 2gb
-BOARD_HAS_LARGE_FILESYSTEM := true
-
-TARGET_RECOVERY_INITRC := device/emulator/twrp/recovery/init-twrp.rc
-TARGET_USERIMAGES_USE_EXT4 := true
-
-# TWRP specific build flags
-DEVICE_RESOLUTION := 720x1280
-#RECOVERY_SDCARD_ON_DATA := true
-RECOVERY_GRAPHICS_USE_LINELENGTH := true
-#BOARD_HAS_NO_REAL_SDCARD := true
-TW_HAS_NO_BOOT_PARTITION := true
-TWRP_CUSTOM_KEYBOARD := ../../../device/emulator/twrp/recovery/hardwarekeyboard.cpp
-
+USE_CAMERA_STUB := true
+
+# inherit from the proprietary version
+-include vendor/emulator/twrp/BoardConfigVendor.mk
+
+TARGET_NO_BOOTLOADER := true
+TARGET_BOOTLOADER_BOARD_NAME := twrp
+
+# Platform
+TARGET_NO_RADIOIMAGE := true
+TARGET_BOARD_PLATFORM := omap4
+
+# Architecture
+TARGET_ARCH := arm
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_SMP := true
+TARGET_ARCH_VARIANT := armv7-a-neon
+ARCH_ARM_HAVE_TLS_REGISTER := true
+
+BOARD_KERNEL_BASE := 0x80000000
+# BOARD_KERNEL_CMDLINE :=
+
+BOARD_BOOTIMAGE_PARTITION_SIZE := 0x105c0000
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x105c0000
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x105c0000
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x105c0000
+BOARD_FLASH_BLOCK_SIZE := 131072
+
+TARGET_PREBUILT_KERNEL := device/emulator/twrp/kernAl
+
+# Recovery:Start
+
+# Use this flag if the board has a ext4 partition larger than 2gb
+BOARD_HAS_LARGE_FILESYSTEM := true
+
+TARGET_RECOVERY_INITRC := device/emulator/twrp/recovery/init-twrp.rc
+TARGET_USERIMAGES_USE_EXT4 := true
+
+# TWRP specific build flags
+DEVICE_RESOLUTION := 720x1280
+#RECOVERY_SDCARD_ON_DATA := true
+RECOVERY_GRAPHICS_USE_LINELENGTH := true
+#BOARD_HAS_NO_REAL_SDCARD := true
+TW_HAS_NO_BOOT_PARTITION := true
+TWRP_CUSTOM_KEYBOARD := ../../../device/emulator/twrp/recovery/hardwarekeyboard.cpp
+

device.mk

@@ -20,7 +20,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     device/emulator/twrp/recovery/root/sbin/network_start.sh:recovery/root/sbin/network_start.sh
 
-#$(call inherit-product, build/target/product/full.mk)
+$(call inherit-product, build/target/product/full.mk)
 
 PRODUCT_NAME := teamwin_twrp
 PRODUCT_BRAND := teamwin

recovery/init-twrp.rc

@@ -34,7 +34,7 @@ service ueventd /sbin/ueventd
 
 service recovery /sbin/recovery
 
-service adbd /sbin/adbd
+service adbd /sbin/adbd recovery
     disabled
 
 #this starts the network needed to get adb working in the emulator