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

Commit 4d26681f authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of 0f205ad9 to master 

Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
parents 833b427d 0f205ad9

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ $(full_classes_jack): $(built_dex) 
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)

$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)

	@echo "Host Jar: $(PRIVATE_MODULE) ($@)"

	$(create-empty-package)

	$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)

	$(add-dex-to-package)

	$(add-carried-jack-resources)

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ endif 
ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),)

$(info ***************************************************************)

$(info ***************************************************************)

$(info Invalid variant: $(TARGET_BUILD_VARIANT)

$(info Valid values are: $(INTERNAL_VALID_VARIANTS)

$(info Invalid variant: $(TARGET_BUILD_VARIANT))

$(info Valid values are: $(INTERNAL_VALID_VARIANTS))

$(info ***************************************************************)

$(info ***************************************************************)

$(error stopping)

target/product/emulator.mk

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ PRODUCT_PACKAGES += \ 
    e2fsck \

    audio.primary.goldfish \

    vibrator.goldfish \

    power.goldfish

    power.goldfish \

    sensors.ranchu





PRODUCT_COPY_FILES += \