diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-07-18 21:02:47 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-07-18 21:02:47 +0000 |
| commit | 33de9cdaefd8684e3411486612e68c0c2bd6be3d (patch) | |
| tree | f1219711bfc0c1333ad8ec611a45f7ab0c416216 /android/android.make | |
| parent | 788e246c996c9ac6e8efae87d13b14af001fd354 (diff) | |
| download | rockbox-33de9cdaefd8684e3411486612e68c0c2bd6be3d.tar.gz rockbox-33de9cdaefd8684e3411486612e68c0c2bd6be3d.zip | |
Android: Refactor some of the glue code.
* Cleanup RockboxService.java by moving the battery and
headphone monitors to separate classes and detaching their instances
* Move those monitors and RockboxTelephony.java into a new
monitors subdirectory
* Call those monitors all the same from native code by creating
the objects there
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30160 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/android.make')
| -rw-r--r-- | android/android.make | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/android.make b/android/android.make index f319bb9507..e4fd3693de 100644 --- a/android/android.make +++ b/android/android.make | |||
| @@ -39,9 +39,10 @@ MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml | |||
| 39 | R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java | 39 | R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java |
| 40 | R_OBJ := $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class | 40 | R_OBJ := $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class |
| 41 | 41 | ||
| 42 | JAVA_SRC := $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/Helper/*.java) | 42 | JAVA_SRC := $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/*.java) |
| 43 | JAVA_SRC += $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/*.java) | 43 | JAVA_SRC += $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/Helper/*.java) |
| 44 | JAVA_SRC += $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/widgets/*.java) | 44 | JAVA_SRC += $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/widgets/*.java) |
| 45 | JAVA_SRC += $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/monitors/*.java) | ||
| 45 | JAVA_OBJ := $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/bin/$(PACKAGE_PATH),$(JAVA_SRC))) | 46 | JAVA_OBJ := $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/bin/$(PACKAGE_PATH),$(JAVA_SRC))) |
| 46 | 47 | ||
| 47 | 48 | ||