diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:24:57 +0200 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-03-26 22:27:40 +0200 |
| commit | f269aa0060950f7b9c42216267c639a2fb556196 (patch) | |
| tree | 218ad3a737f11cb18e48676f300bc22038cfa140 /android/android.make | |
| parent | 9445d4625a3d47b28d756a5763165eb73d6b4ada (diff) | |
| download | rockbox-f269aa0060950f7b9c42216267c639a2fb556196.tar.gz rockbox-f269aa0060950f7b9c42216267c639a2fb556196.zip | |
build system: unify/simplify library handling a bit.
libs in $ROOT/lib now add to $(CORE_LIBS) and $(EXTRA_LIBS) and are
automatically linked by the core and codecs/plugins respectively.
Change-Id: Iff482c792a8c8142718f6a16a450c6e2f1497c9a
Diffstat (limited to 'android/android.make')
| -rw-r--r-- | android/android.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/android.make b/android/android.make index f18b3f958e..dfbc64ef6e 100644 --- a/android/android.make +++ b/android/android.make | |||
| @@ -114,7 +114,7 @@ dex: $(DEX) | |||
| 114 | classes: $(R_OBJ) $(JAVA_OBJ) | 114 | classes: $(R_OBJ) $(JAVA_OBJ) |
| 115 | 115 | ||
| 116 | 116 | ||
| 117 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(RBCODEC_LIB) $(SKINLIB) $(UNWARMINDER) $(CPUFEAT_BUILD)/cpu-features.o | 117 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $(CPUFEAT_BUILD)/cpu-features.o |
| 118 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map | 118 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map |
| 119 | $(call PRINTS,OC $(@F))$(OC) -S -x $@ | 119 | $(call PRINTS,OC $(@F))$(OC) -S -x $@ |
| 120 | 120 | ||