commit d4bcd158a511d7c13763a7379b8a3c44cdb3f2f5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 24 21:03:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 24 21:03:37 2017 +0000
tree 2334c3d07f70f6677d92981203b8216ce757e375
parent 36a570f7e05a6df2cfbfd5379afd3c787dfc79f6
parent 450cd0ba623c162f7ea3af50ee9745f07f00f4a9

Merge "Use HWC2 for all emulator images."

target/board/generic/BoardConfig.mk

diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index a0d1e14..9cbe215 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -23,7 +23,6 @@
 TARGET_CPU_VARIANT := generic
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
-
 HAVE_HTC_AUDIO_DRIVER := true
 BOARD_USES_GENERIC_AUDIO := true
 
@@ -39,6 +38,8 @@
   endif
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation guest and host libraries
 BUILD_EMULATOR_OPENGL := true
 

target/board/generic_arm64/BoardConfig.mk

diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
index 455edc6..a1c7b75 100644
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@@ -69,6 +69,8 @@
   endif
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 

target/board/generic_mips/BoardConfig.mk

diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk
index b2e5fe8..5cc3174 100644
--- a/target/board/generic_mips/BoardConfig.mk
+++ b/target/board/generic_mips/BoardConfig.mk
@@ -46,6 +46,8 @@
   endif
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation guest and host libraries
 BUILD_EMULATOR_OPENGL := true
 

target/board/generic_mips64/BoardConfig.mk

diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk
index 44e6287..d87c924 100644
--- a/target/board/generic_mips64/BoardConfig.mk
+++ b/target/board/generic_mips64/BoardConfig.mk
@@ -61,6 +61,8 @@
   endif
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation guest and host libraries
 BUILD_EMULATOR_OPENGL := true
 

target/board/generic_x86/BoardConfig.mk

diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 499efba..65c4fa5 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -25,6 +25,8 @@
 WITH_DEXPREOPT_BOOT_IMG_ONLY ?= false
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 

target/board/generic_x86_64/BoardConfig.mk

diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk
index 1854724..88f6450 100755
--- a/target/board/generic_x86_64/BoardConfig.mk
+++ b/target/board/generic_x86_64/BoardConfig.mk
@@ -31,6 +31,8 @@
 WITH_DEXPREOPT_BOOT_IMG_ONLY ?= false
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 

target/board/generic_x86_arm/BoardConfig.mk

diff --git a/target/board/generic_x86_arm/BoardConfig.mk b/target/board/generic_x86_arm/BoardConfig.mk
index 75207fc..4a2e159 100644
--- a/target/board/generic_x86_arm/BoardConfig.mk
+++ b/target/board/generic_x86_arm/BoardConfig.mk
@@ -43,6 +43,8 @@
   endif
 endif
 
+TARGET_USES_HWC2 := true
+
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 

target/product/emulator.mk

diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 6226677..c91a2a7 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -54,6 +54,7 @@
     fingerprint.ranchu \
     android.hardware.biometrics.fingerprint@2.1-service \
     sensors.ranchu \
+    android.hardware.graphics.composer@2.1-impl \
 	hwcomposer.goldfish \
 	hwcomposer.ranchu \