Merge "libFLAC is now a static library"
diff --git a/core/main.mk b/core/main.mk
index b4d1c87..1df9a90 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -443,6 +443,7 @@
sdk/archquery \
sdk/androidprefs \
sdk/apkbuilder \
+ sdk/common \
sdk/ddms \
sdk/hierarchyviewer2 \
sdk/ide_common \
diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index 5b13f67..41cd8cd 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -181,7 +181,6 @@
libgsl.so 0xA2A00000 # [~1M]
libhtc_acoustic.so 0xA2900000 # [<64K]
libhtc_ril.so 0xA2800000 # [~1M]
-liblvmxipc.so 0xA2700000 # [~1M] for vendor/nxp
libreference-cdma-sms.so 0xA2600000 # [<64K] for hardware/ril
# libraries for specific apps or temporary libraries
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index 62adeee..9133312 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -27,10 +27,23 @@
sdk_addon_deps :=
files_to_copy :=
+define stub-addon-jar-file
+$(subst .jar,_stub-addon.jar,$(1))
+endef
+
+define stub-addon-jar
+$(call stub-addon-jar-file,$(1)): $(1) | mkstubs
+ $(info Stubbing addon jar using $(PRODUCT_SDK_ADDON_STUB_DEFS))
+ $(hide) java -jar $(call module-installed-files,mkstubs) $(if $(hide),,--v) \
+ "$$<" "$$@" @$(PRODUCT_SDK_ADDON_STUB_DEFS)
+endef
+
# Files that are built and then copied into the sdk-addon
ifneq ($(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_MODULES)),)
$(foreach cf,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_COPY_MODULES), \
$(eval _src := $(call module-stubs-files,$(call word-colon,1,$(cf)))) \
+ $(eval $(call stub-addon-jar,$(_src))) \
+ $(eval _src := $(call stub-addon-jar-file,$(_src))) \
$(if $(_src),,$(eval $(error Unknown or unlinkable module: $(call word-colon,1,$(cf)). Requested by $(INTERNAL_PRODUCT)))) \
$(eval _dest := $(call word-colon,2,$(cf))) \
$(eval files_to_copy += $(_src):$(_dest)) \
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 2268d41..83c2da0 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -20,6 +20,7 @@
BOARD_BOOTIMAGE_MAX_SIZE := 8388608
BOARD_SYSLOADER_MAX_SIZE := 7340032
BOARD_FLASH_BLOCK_SIZE := 512
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 150M
BOARD_USERDATAIMAGE_PARTITION_SIZE := 50M
BOARD_INSTALLERIMAGE_PARTITION_SIZE := 500M
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-core.css b/tools/droiddoc/templates-sdk/assets/android-developer-core.css
index 623ffb9..37acc23 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-core.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-core.css
@@ -196,8 +196,8 @@
/* LAYOUT */
#body-content {
- /* "Preliminary" watermark for preview releases and interim builds.*/
- background:transparent url(images/preliminary.png) repeat scroll 0 0;
+ /* "Preliminary" watermark for preview releases and interim builds.
+ background:transparent url(images/preliminary.png) repeat scroll 0 0; */
margin:0;
position:relative;
width:100%;
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
index fbc0a5d..98417ca 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.css
@@ -61,7 +61,7 @@
}
#side-nav ul ul {
- margin: .35em 0 0 0;
+ margin: .5em 0 0 0;
padding: 0;
}
@@ -517,16 +517,24 @@
}
#jd-content h3 {
- font-size:1.2em;
- color:#222;
- padding: .75em 0 .65em 0;
- margin:0;
+ font-size:1.3em;
+ color:#3a3a3a;
+ padding: 0;
+ margin: 1.5em 0 .65em 0;
}
#jd-content h4 {
font-size:1.1em;
- margin-bottom:.5em;
- color:#222;
+ color:#3a3a3a;
+ padding: 0;
+ margin: 1.25em 0 .65em 0;
+}
+
+#jd-content h5 {
+ font-size:1.0em;
+ color:#3a3a3a;
+ padding: 0;
+ margin: 1em 0 .65em 0;
}
#jd-content .small-header {
@@ -833,7 +841,7 @@
.toggle-content a[href="#"] {
text-decoration:none;
- color:#000;
+ color:inherit;
}
#jd-content .toggle-content img.toggle-content-img {
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-reference.js b/tools/droiddoc/templates-sdk/assets/android-developer-reference.js
index daddde0..31a702b 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-reference.js
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-reference.js
@@ -56,7 +56,7 @@
if (userApiLevelEnabled == 0) {
toggleVisisbleApis(selectedLevel, "body");
} else {
- selectedLevel = $("#apiLevelSelector option:selected").val();
+ selectedLevel = parseInt($("#apiLevelSelector option:selected").val());
toggleVisisbleApis(selectedLevel, "body");
var date = new Date();