diff options
Diffstat (limited to 'android/android.make')
-rw-r--r-- | android/android.make | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/android/android.make b/android/android.make index 7bbe199e6f..6d10121952 100644 --- a/android/android.make +++ b/android/android.make | |||
@@ -14,21 +14,21 @@ ANDROID_DIR=$(ROOTDIR)/android | |||
14 | 14 | ||
15 | # this is a glibc compatibility hack to provide a get_nprocs() replacement. | 15 | # this is a glibc compatibility hack to provide a get_nprocs() replacement. |
16 | # The NDK ships cpu-features.c which has a compatible function android_getCpuCount() | 16 | # The NDK ships cpu-features.c which has a compatible function android_getCpuCount() |
17 | CPUFEAT = $(ANDROID_DIR)/cpufeatures | 17 | CPUFEAT = $(ANDROID_NDK_PATH)/sources/android/cpufeatures |
18 | CPUFEAT_BUILD = $(subst $(ANDROID_DIR),$(BUILDDIR),$(CPUFEAT)) | 18 | CPUFEAT_BUILD = $(BUILDDIR) |
19 | INCLUDES += -I$(CPUFEAT) | 19 | INCLUDES += -I$(CPUFEAT) |
20 | OTHER_SRC += $(CPUFEAT)/cpu-features.c | 20 | OTHER_SRC += $(CPUFEAT)/cpu-features.c |
21 | CLEANOBJS += $(CPUFEAT_BUILD)/cpu-features.o | 21 | CLEANOBJS += $(CPUFEAT_BUILD)/cpu-features.o |
22 | $(CPUFEAT_BUILD)/cpu-features.o: $(CPUFEAT)/cpu-features.c | 22 | $(CPUFEAT_BUILD)/cpu-features.o: $(CPUFEAT)/cpu-features.c |
23 | $(SILENT)mkdir -p $(dir $@) | 23 | $(SILENT)mkdir -p $(dir $@) |
24 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -o $@ -c $^ $(GCCOPTS) -Wno-unused | 24 | $(call PRINTS,CC $(subst $(CPUFEAT)/,,$<))$(CC) -o $@ -c $^ $(GCCOPTS) -Wno-unused |
25 | 25 | ||
26 | .SECONDEXPANSION: # $$(JAVA_OBJ) is not populated until after this | 26 | .SECONDEXPANSION: # $$(JAVA_OBJ) is not populated until after this |
27 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this | 27 | .SECONDEXPANSION: # $$(OBJ) is not populated until after this |
28 | .PHONY: apk classes clean dex dirs libs jar | 28 | .PHONY: apk classes clean dex dirs libs jar |
29 | 29 | ||
30 | # API version | 30 | # API version |
31 | ANDROID_PLATFORM_VERSION=15 | 31 | ANDROID_PLATFORM_VERSION=16 |
32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) | 32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) |
33 | 33 | ||
34 | # android tools | 34 | # android tools |
@@ -62,10 +62,10 @@ LIBS += $(addprefix $(BINLIB_DIR)/lib,$(patsubst %.codec,%.so,$(notdir $(CODEC | |||
62 | 62 | ||
63 | TEMP_APK := $(BUILDDIR)/bin/_rockbox.apk | 63 | TEMP_APK := $(BUILDDIR)/bin/_rockbox.apk |
64 | TEMP_APK2 := $(BUILDDIR)/bin/__rockbox.apk | 64 | TEMP_APK2 := $(BUILDDIR)/bin/__rockbox.apk |
65 | DEX := $(BUILDDIR)/bin/classes.dex | 65 | DEX := $(BUILDDIR)/bin/classes.dex |
66 | JAR := $(BUILDDIR)/bin/classes.jar | 66 | JAR := $(BUILDDIR)/bin/classes.jar |
67 | AP_ := $(BUILDDIR)/bin/resources.ap_ | 67 | AP_ := $(BUILDDIR)/bin/resources.ap_ |
68 | APK := $(BUILDDIR)/rockbox.apk | 68 | APK := $(BUILDDIR)/rockbox.apk |
69 | 69 | ||
70 | _DIRS := $(BUILDDIR)/___/$(PACKAGE_PATH) | 70 | _DIRS := $(BUILDDIR)/___/$(PACKAGE_PATH) |
71 | DIRS += $(subst ___,gen,$(_DIRS)) | 71 | DIRS += $(subst ___,gen,$(_DIRS)) |