am 224f28a8: am 049d97d7: am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '224f28a845a107d46500c7977cb0e2abeff1ebba':
MIPS support to *.mk files and envsetup.sh
diff --git a/core/config.mk b/core/config.mk
index 194fbe1..ad23612 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -276,7 +276,6 @@
AAPT := $(HOST_OUT_EXECUTABLES)/aapt$(HOST_EXECUTABLE_SUFFIX)
AIDL := $(HOST_OUT_EXECUTABLES)/aidl$(HOST_EXECUTABLE_SUFFIX)
PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX)
-ICUDATA := $(HOST_OUT_EXECUTABLES)/icudata$(HOST_EXECUTABLE_SUFFIX)
SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)
MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX)
diff --git a/core/package.mk b/core/package.mk
index 3f911fb..e1b7da3 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -53,14 +53,6 @@
endif
LOCAL_MODULE := $(LOCAL_PACKAGE_NAME)
-# Android packages should use Android resources or assets.
-ifneq (,$(LOCAL_JAVA_RESOURCE_DIRS))
-$(error $(LOCAL_PATH): Package modules may not set LOCAL_JAVA_RESOURCE_DIRS)
-endif
-ifneq (,$(LOCAL_JAVA_RESOURCE_FILES))
-$(error $(LOCAL_PATH): Package modules may not set LOCAL_JAVA_RESOURCE_FILES)
-endif
-
ifeq ($(strip $(LOCAL_MANIFEST_FILE)),)
LOCAL_MANIFEST_FILE := AndroidManifest.xml
endif
@@ -384,6 +376,9 @@
ifneq ($(full_classes_jar),)
$(add-dex-to-package)
endif
+ifneq ($(extra_jar_args),)
+ $(add-java-resources-to-package)
+endif
$(sign-package)
@# Alignment must happen after all other zip operations.
$(align-package)
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 517af49..8c38d66 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -146,7 +146,6 @@
hierarchyviewerlib \
hist_trace \
hosttestlib \
- icudata \
idegen \
ime \
init \
@@ -176,8 +175,6 @@
libandroid_runtime \
libandroid_servers \
libarity \
- libastl \
- libastl_host \
libaudio \
libaudioeffect_jni \
libaudioflinger \
diff --git a/tools/bin2asm/Android.mk b/tools/bin2asm/Android.mk
deleted file mode 100644
index 4522a20..0000000
--- a/tools/bin2asm/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- icudata.c
-
-LOCAL_MODULE := icudata
-
-include $(BUILD_HOST_EXECUTABLE)
-
diff --git a/tools/bin2asm/data b/tools/bin2asm/data
deleted file mode 100644
index 3be865f..0000000
--- a/tools/bin2asm/data
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Convert a data file into a .S file suitable for assembly.
- * This reads from stdin and writes to stdout and takes a single
- * argument for the name of the symbol in the assembly file.
- */
-
-#include <stdio.h>
-
-int main(int argc, char *argv[]) {
- unsigned char buf[4096];
- size_t amt;
- size_t i;
- int col = 0;
- char *name = argv[1];
-
- printf("\
-#ifdef __APPLE_CC__\n\
-/*\n\
- * The mid-2007 version of gcc that ships with Macs requires a\n\
- * comma on the .section line, but the rest of the world thinks\n\
- * that's a syntax error. It also wants globals to be explicitly\n\
- * prefixed with \"_\" as opposed to modern gccs that do the\n\
- * prefixing for you.\n\
- */\n\
-.globl _%s\n\
- .section .rodata,\n\
- .align 8\n\
-_%s:\n\
-#else\n\
-.globl %s\n\
- .section .rodata\n\
- .align 8\n\
-%s:\n\
-#endif\n\
-", name, name, name, name);
-
- while (! feof(stdin)) {
- amt = fread(buf, 1, sizeof(buf), stdin);
- for (i = 0; i < amt; i++) {
- printf((col == 0) ? ".byte %3d" : ",%3d", buf[i]);
- col++;
- if (col == 16) {
- printf("\n");
- col = 0;
- }
- }
- }
-
- if (col != 0) {
- printf("\n");
- }
-}
diff --git a/tools/bin2asm/icudata.c b/tools/bin2asm/icudata.c
deleted file mode 100644
index ecd1b4b..0000000
--- a/tools/bin2asm/icudata.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Convert a data file into a .S file suitable for assembly.
- * This reads from stdin and writes to stdout and takes a single
- * argument for the name of the symbol in the assembly file.
- */
-
-#include <stdio.h>
-
-int main(int argc, char *argv[]) {
- unsigned char buf[4096];
- size_t amt;
- size_t i;
- int col = 0;
- char *name;
-
- if (argc != 2) {
- fprintf(stderr, "usage: %s NAME < DAT_FILE > ASM_FILE\n", argv[0]);
- for (i=0; i<argc; i++) {
- fprintf(stderr, " '%s'", argv[i]);
- }
- fprintf(stderr, "\n");
- return 1;
- }
-
- name = argv[1];
-
- printf("\
-#ifdef __APPLE_CC__\n\
-/*\n\
- * The mid-2007 version of gcc that ships with Macs requires a\n\
- * comma on the .section line, but the rest of the world thinks\n\
- * that's a syntax error. It also wants globals to be explicitly\n\
- * prefixed with \"_\" as opposed to modern gccs that do the\n\
- * prefixing for you.\n\
- */\n\
-.globl _%s\n\
- .section .rodata,\n\
- .align 8\n\
-_%s:\n\
-#else\n\
-.globl %s\n\
- .section .rodata\n\
- .align 8\n\
-%s:\n\
-#endif\n\
-", name, name, name, name);
-
- while (! feof(stdin)) {
- amt = fread(buf, 1, sizeof(buf), stdin);
- for (i = 0; i < amt; i++) {
- if (col == 0) {
- printf(".byte ");
- }
- printf("0x%02x", buf[i]);
- col++;
- if (col == 16) {
- printf("\n");
- col = 0;
- } else if (col % 4 == 0) {
- printf(", ");
- } else {
- printf(",");
- }
- }
- }
-
- if (col != 0) {
- printf("\n");
- }
-
- return 0;
-}