Merge "Add Hammerhead to bliss.devices" into o8.0
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index d1a19f9..16e8429 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -29,17 +29,19 @@
# TARGET_KERNEL_ARCH = Kernel Arch
# TARGET_KERNEL_HEADER_ARCH = Optional Arch for kernel headers if
# different from TARGET_KERNEL_ARCH
-# TARGET_USES_UNCOMPRESSED_KERNEL = 'true' if Kernel is uncompressed,
-# optional, defaults to false
# TARGET_KERNEL_CROSS_COMPILE_PREFIX = Compiler prefix (e.g. arm-eabi-)
# defaults to arm-linux-androidkernel- for arm
# aarch64-linux-androidkernel- for arm64
# x86_64-linux-androidkernel- for x86
#
-# BOARD_KERNEL_IMAGE_NAME = Built image name, optional,
-# defaults to Image.gz on arm64
-# defaults to Image if TARGET_USES_UNCOMPRESSED_KERNEL
-# defaults to zImage otherwise
+# BOARD_KERNEL_IMAGE_NAME = Built image name
+# for ARM use: zImage
+# for ARM64 use: Image.gz
+# for uncompressed use: Image
+# If using an appended DT, append '-dtb'
+# to the end of the image name.
+# For example, for ARM devices,
+# use zImage-dtb instead of zImage.
#
# KERNEL_TOOLCHAIN_PREFIX = Overrides TARGET_KERNEL_CROSS_COMPILE_PREFIX,
# Set this var in shell to override
@@ -95,25 +97,16 @@
KERNEL_HEADER_DEFCONFIG := $(KERNEL_DEFCONFIG)
endif
-
-ifneq ($(BOARD_KERNEL_IMAGE_NAME),)
- TARGET_PREBUILT_INT_KERNEL_TYPE := $(BOARD_KERNEL_IMAGE_NAME)
-else
- ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true)
- TARGET_PREBUILT_INT_KERNEL_TYPE := Image
- else
- ifeq ($(KERNEL_ARCH),arm64)
- TARGET_PREBUILT_INT_KERNEL_TYPE := Image.gz
- else
- TARGET_PREBUILT_INT_KERNEL_TYPE := zImage
- endif
- endif
- ifeq ($(TARGET_KERNEL_APPEND_DTB),true)
- TARGET_PREBUILT_INT_KERNEL_TYPE := $(TARGET_PREBUILT_INT_KERNEL_TYPE)-dtb
- endif
+ifeq ($(BOARD_KERNEL_IMAGE_NAME),)
+$(error BOARD_KERNEL_IMAGE_NAME not defined.)
endif
-
-TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/$(TARGET_PREBUILT_INT_KERNEL_TYPE)
+ifneq ($(TARGET_USES_UNCOMPRESSED_KERNEL),)
+$(error TARGET_USES_UNCOMPRESSED_KERNEL is deprecated.)
+endif
+ifneq ($(TARGET_KERNEL_APPEND_DTB),)
+$(error TARGET_KERNEL_APPEND_DTB is deprecated.)
+endif
+TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/$(BOARD_KERNEL_IMAGE_NAME)
# Clear this first to prevent accidental poisoning from env
MAKE_FLAGS :=
@@ -306,7 +299,7 @@
TARGET_KERNEL_BINARIES: $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL_STAMP)
@echo "Building Kernel"
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE)
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(BOARD_KERNEL_IMAGE_NAME)
$(hide) if grep -q 'CONFIG_OF=y' $(KERNEL_CONFIG) ; \
then \
echo "Building DTBs" ; \
diff --git a/config/manifest.xml b/config/manifest.xml
new file mode 100644
index 0000000..ee0340a
--- /dev/null
+++ b/config/manifest.xml
@@ -0,0 +1,87 @@
+<manifest version="1.0" type="device">
+ <hal format="hidl">
+ <name>android.hardware.audio</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IDevicesFactory</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.audio.effect</name>
+ <transport>hwbinder</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IEffectsFactory</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.configstore</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>ISurfaceFlingerConfigs</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.dumpstate</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IDumpstateDevice</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.graphics.allocator</name>
+ <transport arch="32+64">passthrough</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IAllocator</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.graphics.mapper</name>
+ <transport arch="32+64">passthrough</transport>
+ <version>2.0</version>
+ <interface>
+ <name>IMapper</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.media.omx</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IOmx</name>
+ <instance>default</instance>
+ </interface>
+ <interface>
+ <name>IOmxStore</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.renderscript</name>
+ <transport arch="32+64">passthrough</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IDevice</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
+ <name>android.hardware.usb</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IUsb</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest>
diff --git a/config/treble.mk b/config/treble.mk
index bcf4a2e..11afc56 100644
--- a/config/treble.mk
+++ b/config/treble.mk
@@ -2,7 +2,6 @@
PRODUCT_PACKAGES += \
android.hardware.graphics.mapper@2.0-impl \
android.hardware.graphics.allocator@2.0-impl \
- android.hardware.graphics.allocator@2.0-service
# HWComposer HAL
PRODUCT_PACKAGES += \
@@ -11,6 +10,7 @@
# Audio HAL
PRODUCT_PACKAGES += \
android.hardware.audio@2.0-impl \
+ android.hardware.audio@2.0-service \
android.hardware.audio.effect@2.0-impl \
android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.0-impl
@@ -29,6 +29,11 @@
PRODUCT_PACKAGES += \
android.hardware.drm@1.0-impl
+# DumpState HAL
+PRODUCT_PACKAGES += \
+ android.hardware.dumpstate@1.0-impl \
+ android.hardware.dumpstate@1.0-service
+
# Gatekeeper HAL
PRODUCT_PACKAGES += \
android.hardware.gatekeeper@1.0-impl
@@ -63,9 +68,9 @@
PRODUCT_PACKAGES += \
android.hardware.power@1.0-impl
-# RenderScript HAL
-PRODUCT_PACKAGES += \
- android.hardware.renderscript@1.0-impl
+# RenderScript HAL
+PRODUCT_PACKAGES += \
+ android.hardware.renderscript@1.0-impl
# Sensors HAL
PRODUCT_PACKAGES += \
@@ -75,9 +80,10 @@
PRODUCT_PACKAGES += \
android.hardware.thermal@1.0-impl
-# USB HAL
-PRODUCT_PACKAGES += \
- android.hardware.usb@1.0-service
+# USB HAL
+PRODUCT_PACKAGES += \
+ android.hardware.usb@1.0-impl \
+ android.hardware.usb@1.0-service
# Vibrator
PRODUCT_PACKAGES += \
diff --git a/prebuilt/common/privapp/com.farmerbb.taskbar.support.apk b/prebuilt/common/privapp/com.farmerbb.taskbar.support.apk
new file mode 100644
index 0000000..787cef0
--- /dev/null
+++ b/prebuilt/common/privapp/com.farmerbb.taskbar.support.apk
Binary files differ