diff options
| author | David Turner <digit@google.com> | 2015-09-25 14:38:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 14:38:51 +0000 |
| commit | 38a4a2f1c919730bf17e2d4e5a8e49803f182318 (patch) | |
| tree | dabfbc0fa128433c79fe3289b01463c0ab56a3a1 | |
| parent | c4dfccee900211b2167e879e1e46214b4949ced7 (diff) | |
| parent | c1d796f44ae74a629f4d6d5d487bdf028d3d2eb2 (diff) | |
| download | goldfish-brillo-m8-dev.tar.gz | |
am c1d796f4: am ef6c1c57: Merge changes Ie449043b,I0c08e8cdbrillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-dev
* commit 'c1d796f44ae74a629f4d6d5d487bdf028d3d2eb2':
GPU: Build gralloc.ranchu.so
init.ranchu.rc: enable qemu-props & use GPU emulation if available
| -rw-r--r-- | init.ranchu.rc | 20 | ||||
| -rw-r--r-- | opengl/system/gralloc/Android.mk | 15 |
2 files changed, 27 insertions, 8 deletions
diff --git a/init.ranchu.rc b/init.ranchu.rc index bad365d9..27cf95ed 100644 --- a/init.ranchu.rc +++ b/init.ranchu.rc @@ -30,14 +30,6 @@ on boot setprop status.battery.level_raw 50 setprop status.battery.level_scale 9 -# Disable GPU support - setprop ro.kernel.qemu 1 - setprop ro.kernel.qemu.gles 0 - symlink /system/lib64/hw/gralloc.default.aosp.so /system/lib64/hw/gralloc.default.so - -# disable RenderScript - setprop config.disable_renderscript 1 - # disable some daemons the emulator doesn't want stop dund stop akmd @@ -62,6 +54,18 @@ service goldfish-setup /system/etc/init.goldfish.sh group root oneshot +# The qemu-props program is used to set various system +# properties on boot. It must be run early during the boot +# process to avoid race conditions with other daemons that +# might read them (e.g. surface flinger), so define it in +# class 'core' +# +service qemu-props /system/bin/qemu-props + class core + user root + group root + oneshot + # -Q is a special logcat option that forces the # program to check wether it runs on the emulator # if it does, it redirects its output to the device diff --git a/opengl/system/gralloc/Android.mk b/opengl/system/gralloc/Android.mk index 71ac2f2e..b93164af 100644 --- a/opengl/system/gralloc/Android.mk +++ b/opengl/system/gralloc/Android.mk @@ -17,4 +17,19 @@ LOCAL_SHARED_LIBRARIES += libdl $(call emugl-end-module) +$(call emugl-begin-shared-library,gralloc.ranchu) +$(call emugl-import,libGLESv1_enc lib_renderControl_enc libOpenglSystemCommon) +$(call emugl-set-shared-library-subpath,hw) + +LOCAL_CFLAGS += -DLOG_TAG=\"gralloc_ranchu\" +LOCAL_CFLAGS += -Wno-missing-field-initializers + +LOCAL_SRC_FILES := gralloc.cpp + +# Need to access the special OPENGL TLS Slot +LOCAL_C_INCLUDES += bionic/libc/private +LOCAL_SHARED_LIBRARIES += libdl + +$(call emugl-end-module) + endif # BUILD_EMULATOR_OPENGL_DRIVER != false |