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

Commit 7d8c535c authored by Ying Wang's avatar Ying Wang Committed by Jean-Baptiste Queru
Browse files

Fix build. 

Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
parent f8a30598

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES) 


# -----------------------------------------------------------------

# The emulator package



ifeq ($(BUILD_EMULATOR),true)

INTERNAL_EMULATOR_PACKAGE_FILES += \

        $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \

        prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \
@@ -1315,6 +1315,7 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) 
	@echo "Package: $@"

	$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)



endif

# -----------------------------------------------------------------

# Old PDK stuffs, retired

# The pdk package (Platform Development Kit)

core/main.mk

+3 −1
Original line number Diff line number Diff line
@@ -187,7 +187,9 @@ MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk 
ifeq ($(strip $(wildcard $(MACOSX_SDK))),)

  BUILD_EMULATOR := false

endif

endif

else   # HOST_OS is not darwin

  BUILD_EMULATOR := true

endif  # HOST_OS is darwin



$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \

        > $(OUT_DIR)/versions_checked.mk)