Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on May 15th, 2012  |  syntax: None  |  size: 3.57 KB  |  views: 22  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/android/android.make b/android/android.make
  2. index 22b80fb..d684de9 100644
  3. --- a/android/android.make
  4. +++ b/android/android.make
  5. @@ -9,7 +9,7 @@
  6.  
  7.  .SECONDEXPANSION: # $$(JAVA_OBJ) is not populated until after this
  8.  .SECONDEXPANSION: # $$(OBJ) is not populated until after this
  9. -
  10. +.PHONY: apk classes clean dex dirs libs
  11.  
  12.  $(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB)
  13.         $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS)
  14. @@ -42,7 +42,9 @@ JAVA_OBJ      := $(call java2class,$(subst /src/,/bin/,$(JAVA_SRC)))
  15.  LIBS           := $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so
  16.  TEMP_APK       := $(BUILDDIR)/bin/_Rockbox.apk
  17.  TEMP_APK2      := $(BUILDDIR)/bin/__Rockbox.apk
  18. -APK                    := $(BUILDDIR)/bin/Rockbox.apk
  19. +DEX            := $(BUILDDIR)/bin/classes.dex
  20. +AP_            := $(BUILDDIR)/bin/resources.ap_
  21. +APK            := $(BUILDDIR)/bin/Rockbox.apk
  22.  
  23.  _DIRS          := $(BUILDDIR)/___/$(PACKAGE_PATH)
  24.  DIRS           := $(subst ___,bin,$(_DIRS))
  25. @@ -50,8 +52,8 @@ DIRS          += $(subst ___,gen,$(_DIRS))
  26.  DIRS           += $(subst ___,data,$(_DIRS))
  27.  DIRS           += $(BUILDDIR)/libs/armeabi
  28.  
  29. -$(R_JAVA): $(MANIFEST)
  30. -       $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$<))$(AAPT) package -f -m -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res -I $(ANDROID_PLATFORM)/android.jar -F $(BUILDDIR)/bin/resources.ap_
  31. +$(R_JAVA) $(AP_): $(MANIFEST)
  32. +       $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res -I $(ANDROID_PLATFORM)/android.jar -F $(AP_)
  33.  
  34.  $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class: $(R_JAVA)
  35.         $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \
  36. @@ -63,12 +65,12 @@ $(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.ja
  37.         -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin -sourcepath \
  38.         $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $<
  39.  
  40. -classes: $(R_OBJ) $(JAVA_OBJ)
  41. -
  42. -$(BUILDDIR)/bin/classes.dex: classes
  43. +$(DEX): $(R_OBJ) $(JAVA_OBJ)
  44.         $(call PRINTS,DX $(subst $(BUILDDIR)/,,$@))$(DX) --dex --output=$@ $(BUILDDIR)/bin
  45.  
  46. -dex: $(BUILDDIR)/bin/classes.dex
  47. +classes: $(R_OBJ) $(JAVA_OBJ)
  48. +
  49. +dex: $(DEX)
  50.  
  51.  $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
  52.         $(call PRINTS,CP $(BINARY))cp $^ $@
  53. @@ -83,7 +85,7 @@ libs: $(LIBS)
  54.  
  55.  $(TEMP_APK): libs dex
  56.         $(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(APKBUILDER) $@ \
  57. -       -u -z $(BUILDDIR)/bin/resources.ap_ -f $(BUILDDIR)/bin/classes.dex -nf $(BUILDDIR)/libs
  58. +       -u -z $(AP_) -f $(DEX) -nf $(BUILDDIR)/libs
  59.  
  60.  $(APK): $(TEMP_APK)
  61.         $(SILENT)rm -f $@
  62. @@ -97,3 +99,7 @@ dirs:
  63.         $(SILENT)mkdir -p $(DIRS)
  64.  
  65.  apk: dirs $(APK)
  66. +
  67. +clean::
  68. +       rm -f $(JAVA_OBJ) $(R_JAVA) $(R_OBJ) $(TEMP_APK) $(TEMP_APK2) $(APK) $(DEX) $(BUILDDIR)/_rockbox.zip $(AP_)
  69. +
  70. diff --git a/tools/root.make b/tools/root.make
  71. index 3d19e62..6e4576b 100644
  72. --- a/tools/root.make
  73. +++ b/tools/root.make
  74. @@ -47,7 +47,7 @@ RBINFO = $(BUILDDIR)/rockbox-info.txt
  75.  # list suffixes to be understood by $*
  76.  .SUFFIXES: .rock .codec .map .elf .c .S .o .bmp .a
  77.  
  78. -.PHONY: all clean tags zip tools manual bin build info langs
  79. +.PHONY: all clean tags zip tools manual bin build info langs androidclean
  80.  
  81.  ifeq (,$(filter clean veryclean reconf tags voice voicetools manual manual-pdf manual-html manual-zhtml manual-txt manual-ztxt manual-zip help fontzip ,$(MAKECMDGOALS)))
  82.  # none of the above
  83. @@ -136,7 +136,7 @@ tools: $(TOOLS)
  84.  veryclean: clean
  85.         $(SILENT)rm -rf $(TOOLS)
  86.  
  87. -clean:
  88. +clean::
  89.         $(SILENT)echo Cleaning build directory
  90.         $(SILENT)rm -rf rockbox.zip rockbox.7z rockbox.tar rockbox.tar.gz \
  91.                 rockbox.tar.bz2 TAGS apps firmware tools comsim sim lang lib \
clone this paste RAW Paste Data