Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35149ca0 authored by Bo Hu's avatar Bo Hu Committed by Gerrit Code Review
Browse files

Merge changes from topic "aosp-emulator-oc" 

* changes:
  emulator: fix widevine drm vndbinder denial
  emulator: fix selinux issues
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
parents e7a05168 dc745a90

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -937,6 +937,8 @@ ifdef is_sdk_build 
                      $(TARGET_OUT_DATA)/%, \

                              $(sort $(call get-tagged-modules,gnu)))

  target_gnu_MODULES := $(filter-out $(TARGET_OUT_EXECUTABLES)/%,$(target_gnu_MODULES))

  target_gnu_MODULES := $(filter-out %/libopenjdkjvmti.so,$(target_gnu_MODULES))

  target_gnu_MODULES := $(filter-out %/libopenjdkjvmtid.so,$(target_gnu_MODULES))

  $(info Removing from sdk:)$(foreach d,$(target_gnu_MODULES),$(info : $(d)))

  modules_to_install := \

              $(filter-out $(target_gnu_MODULES),$(modules_to_install))

core/tasks/sdk-addon.mk

+3 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ endif 
# Files copied in the system-image directory

files_to_copy += \

	$(addon_dir_img):$(INSTALLED_QEMU_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \

	$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.img \

	$(addon_dir_img):$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \

	$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \

	$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
@@ -114,9 +115,10 @@ $(full_target): $(sdk_addon_deps) | $(ACP) 
	$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) )



$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)

$(full_target_img): $(full_target) $(addon_img_source_prop)

$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP)

	@echo Packaging SDK Addon System-Image: $@

	$(hide) mkdir -p $(dir $@)

	$(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data

	$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rqX $$F $(notdir $(PRIVATE_STAGING_DIR)) )

target/board/generic/BoardConfig.mk

+8 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ ifeq ($(HOST_OS),linux) 
endif



TARGET_USES_HWC2 := true

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3



# Build OpenGLES emulation guest and host libraries

BUILD_EMULATOR_OPENGL := true
@@ -51,10 +52,16 @@ USE_OPENGL_RENDERER := true 
TARGET_USERIMAGES_USE_EXT4 := true

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648  # 2 GB

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

TARGET_COPY_OUT_VENDOR := vendor

# ~100 MB vendor image. Please adjust system image / vendor image sizes

# when finalizing them.

BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic/device.mk

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 


PRODUCT_PROPERTY_OVERRIDES := \

    ro.ril.hsxpa=1 \

    ro.ril.gprsclass=10 \

    ro.adb.qemud=1

    ro.ril.gprsclass=10



PRODUCT_COPY_FILES := \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \

target/board/generic/sepolicy/adbd.te

0 → 100644
+1 −0
Original line number Diff line number Diff line 
set_prop(adbd, ctl_mdnsd_prop);