diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:21 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:21 -0800 |
| commit | c2db2b6accc7888df514261a7240e7759df95a4c (patch) | |
| tree | 0d7ecd37a534c15348cbad01d0d1f84183b7b4d8 /android | |
| parent | df7881f07f53b041dc0568be8528e9dbb74994cc (diff) | |
| download | external_qemu-c2db2b6accc7888df514261a7240e7759df95a4c.zip external_qemu-c2db2b6accc7888df514261a7240e7759df95a4c.tar.gz external_qemu-c2db2b6accc7888df514261a7240e7759df95a4c.tar.bz2 | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'android')
| -rw-r--r-- | android/build/definitions.make | 1 | ||||
| -rw-r--r-- | android/build/host_executable.make | 12 | ||||
| -rw-r--r-- | android/utils/ini.c | 2 | ||||
| -rw-r--r-- | android/utils/ini.h | 4 | ||||
| -rw-r--r-- | android/vm/info.c | 2 |
5 files changed, 10 insertions, 11 deletions
diff --git a/android/build/definitions.make b/android/build/definitions.make index c4183ea..fd1dd63 100644 --- a/android/build/definitions.make +++ b/android/build/definitions.make @@ -54,6 +54,7 @@ define compile-c-source SRC:=$(1) OBJ:=$$(LOCAL_OBJS_DIR)/$$(SRC:%.c=%.o) LOCAL_OBJECTS += $$(OBJ) +DEPENDENCY_DIRS += $$(dir $$(OBJ)) $$(OBJ): PRIVATE_CFLAGS := $$(CFLAGS) $$(LOCAL_CFLAGS) -I$$(LOCAL_PATH) -I$$(OBJS_DIR) $$(OBJ): PRIVATE_CC := $$(LOCAL_CC) $$(OBJ): PRIVATE_OBJ := $$(OBJ) diff --git a/android/build/host_executable.make b/android/build/host_executable.make index a9b51d8..62f4762 100644 --- a/android/build/host_executable.make +++ b/android/build/host_executable.make @@ -14,22 +14,20 @@ # # first, call a library containing all object files -include $(BUILD_HOST_STATIC_LIBRARY) - -# now, link the executable with it -LOCAL_BUILT_LIBRARY := $(LOCAL_BUILT_MODULE) LOCAL_BUILT_MODULE := $(call executable-path,$(LOCAL_MODULE)) +LOCAL_CC ?= $(CC) +include $(BUILD_SYSTEM)/binary.make LOCAL_LDLIBS := $(foreach lib,$(LOCAL_STATIC_LIBRARIES),$(call library-path,$(lib))) $(LOCAL_LDLIBS) $(LOCAL_BUILT_MODULE): PRIVATE_LDFLAGS := $(LDFLAGS) $(LOCAL_LDFLAGS) $(LOCAL_BUILT_MODULE): PRIVATE_LDLIBS := $(LOCAL_LDLIBS) -$(LOCAL_BUILT_MODULE): PRIVATE_LIBRARY := $(LOCAL_BUILT_LIBRARY) +$(LOCAL_BUILT_MODULE): PRIVATE_OBJS := $(LOCAL_OBJECTS) -$(LOCAL_BUILT_MODULE): $(LOCAL_BUILT_LIBRARY) +$(LOCAL_BUILT_MODULE): $(LOCAL_OBJECTS) @ mkdir -p $(dir $@) @ echo "Executable: $@" - $(hide) $(LD) $(PRIVATE_LDFLAGS) -o $@ $(PRIVATE_LIBRARY) $(PRIVATE_LDLIBS) + $(hide) $(LD) $(PRIVATE_LDFLAGS) -o $@ $(PRIVATE_LIBRARY) $(PRIVATE_OBJS) $(PRIVATE_LDLIBS) EXECUTABLES += $(LOCAL_BUILT_MODULE) $(LOCAL_BUILT_MODULE): $(foreach lib,$(LOCAL_STATIC_LIBRARIES),$(call library-path,$(lib))) diff --git a/android/utils/ini.c b/android/utils/ini.c index d99ecdd..096f44c 100644 --- a/android/utils/ini.c +++ b/android/utils/ini.c @@ -159,7 +159,7 @@ isKeyStartChar( int c ) static int isKeyChar( int c ) { - return isKeyStartChar(c) || ((unsigned)(c-'0') < 10) || (c == '.'); + return isKeyStartChar(c) || ((unsigned)(c-'0') < 10) || (c == '.') || (c == '-'); } IniFile* diff --git a/android/utils/ini.h b/android/utils/ini.h index 41b369b..ad6b36a 100644 --- a/android/utils/ini.h +++ b/android/utils/ini.h @@ -23,7 +23,7 @@ * assignment := <space>* <keyName> <space>* '=' <space>* <valueString> <space>* <LF> * keyName := <keyNameStartChar> <keyNameChar>* * keyNameStartChar := [A-Za-z_] - * keyNameChar := [A-Za-z0-9_.] + * keyNameChar := [A-Za-z0-9_.-] * valueString := <noLF>* * space := ' ' | '\t' * LF := '\r\n' | '\n' | '\r' @@ -35,7 +35,7 @@ * - empty lines are ignored, as well as lines beginning with ';' or '#' * - lines must be of the form: "<keyName> = <value>" * - key names must start with a letter or an underscore - * - other key name characters can be letters, digits, underscores or dots + * - other key name characters can be letters, digits, underscores, dots or dashes * * - leading and trailing space are allowed and ignored before/after the key name * and before/after the value diff --git a/android/vm/info.c b/android/vm/info.c index e3f04ff..a82b60b 100644 --- a/android/vm/info.c +++ b/android/vm/info.c @@ -1094,7 +1094,7 @@ _checkSkinDir( char* temp, char* end, const char* skinDirRoot, const char* s return -1; /* first, is this a normal skin directory ? */ - q = bufprint(q, end, "/layout"); + q = bufprint(p, end, "/layout"); if (q < end && path_exists(temp)) { /* yes */ *p = 0; |