diff options
| author | Roman Kiryanov <rkir@google.com> | 2020-05-12 10:26:20 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2020-05-13 11:17:51 -0700 |
| commit | 90ad80401fd6a11c718a2d456cdaf719dd7a9cba (patch) | |
| tree | 596eac42723c05ec263c6b7f3be97462eb37bf74 /system/OpenglSystemCommon | |
| parent | 69df8a0319b921379b946023f2cc719c762c3d0a (diff) | |
| download | device_generic_goldfish-opengl-90ad80401fd6a11c718a2d456cdaf719dd7a9cba.tar.gz device_generic_goldfish-opengl-90ad80401fd6a11c718a2d456cdaf719dd7a9cba.tar.bz2 device_generic_goldfish-opengl-90ad80401fd6a11c718a2d456cdaf719dd7a9cba.zip | |
Migrate libGoldfishAddressSpace to .bp
for guest builds
Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I503f202961f6ba68f95dc92074030d91f0c9f666
Diffstat (limited to 'system/OpenglSystemCommon')
| -rw-r--r-- | system/OpenglSystemCommon/Android.mk | 7 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk index dd4e3eac..86d3dd19 100644 --- a/system/OpenglSystemCommon/Android.mk +++ b/system/OpenglSystemCommon/Android.mk @@ -1,7 +1,12 @@ LOCAL_PATH := $(call my-dir) $(call emugl-begin-shared-library,libOpenglSystemCommon) -$(call emugl-import,libGLESv1_enc libGLESv2_enc lib_renderControl_enc libGoldfishAddressSpace$(GOLDFISH_OPENGL_LIB_SUFFIX)) +$(call emugl-import,libGLESv1_enc libGLESv2_enc lib_renderControl_enc) +ifeq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST)) +$(call emugl-import,libGoldfishAddressSpace$(GOLDFISH_OPENGL_LIB_SUFFIX)) +else +$(call emugl-export,STATIC_LIBRARIES,libGoldfishAddressSpace) +endif LOCAL_SRC_FILES := \ FormatConversions.cpp \ diff --git a/system/OpenglSystemCommon/CMakeLists.txt b/system/OpenglSystemCommon/CMakeLists.txt index 17752609..b76d6ac9 100644 --- a/system/OpenglSystemCommon/CMakeLists.txt +++ b/system/OpenglSystemCommon/CMakeLists.txt @@ -1,7 +1,7 @@ # This is an autogenerated file! Do not edit! # instead run make from .../device/generic/goldfish-opengl # which will re-generate this file. -android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/system/OpenglSystemCommon/Android.mk" "99e5337d0a5b888580dd475c32e74e2821b558bca396d0270b7413dbf3783534") +android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/system/OpenglSystemCommon/Android.mk" "921ccd71f620cc2404efee541de2a2c55cec1b6fa13e98f98eb905d22bd0b0c6") set(OpenglSystemCommon_src FormatConversions.cpp HostConnection.cpp QemuPipeStream.cpp ProcessPipe.cpp AddressSpaceStream.cpp ThreadInfo_host.cpp) android_add_library(TARGET OpenglSystemCommon SHARED LICENSE Apache-2.0 SRC FormatConversions.cpp HostConnection.cpp QemuPipeStream.cpp ProcessPipe.cpp AddressSpaceStream.cpp ThreadInfo_host.cpp) target_include_directories(OpenglSystemCommon PRIVATE ${GOLDFISH_DEVICE_ROOT}/system/OpenglSystemCommon ${GOLDFISH_DEVICE_ROOT}/bionic/libc/platform ${GOLDFISH_DEVICE_ROOT}/bionic/libc/private ${GOLDFISH_DEVICE_ROOT}/system/OpenglSystemCommon/bionic-include ${GOLDFISH_DEVICE_ROOT}/system/vulkan_enc ${GOLDFISH_DEVICE_ROOT}/android-emu ${GOLDFISH_DEVICE_ROOT}/shared/GoldfishAddressSpace/include ${GOLDFISH_DEVICE_ROOT}/system/renderControl_enc ${GOLDFISH_DEVICE_ROOT}/system/GLESv2_enc ${GOLDFISH_DEVICE_ROOT}/system/GLESv1_enc ${GOLDFISH_DEVICE_ROOT}/shared/OpenglCodecCommon ${GOLDFISH_DEVICE_ROOT}/./host/include/libOpenglRender ${GOLDFISH_DEVICE_ROOT}/./system/include ${GOLDFISH_DEVICE_ROOT}/./../../../external/qemu/android/android-emugl/guest) |