Merge "Fix the path for findbugs."
diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk
index 6515eb5..9518ba7 100644
--- a/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -38,7 +38,7 @@
TARGET_NDK_GCC_VERSION := 4.8
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
-TARGET_GCC_VERSION := 4.8
+TARGET_GCC_VERSION := 4.9
else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif
@@ -73,13 +73,9 @@
android_config_h := $(call select-android-config-h,linux-arm64)
-# HACK: globally disable -fstack-protector until the toolchain supports it
-TARGET_GLOBAL_UNSUPPORTED_CFLAGS := \
- -fstack-protector \
- -fstack-protector-all \
-
TARGET_GLOBAL_CFLAGS += \
-fpic -fPIE \
+ -fstack-protector \
-ffunction-sections \
-fdata-sections \
-funwind-tables \
@@ -165,6 +161,7 @@
define transform-o-to-shared-lib-inner
$(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \
+ -Wl,--gc-sections \
-Wl,-shared,-Bsymbolic \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
@@ -189,6 +186,7 @@
define transform-o-to-executable-inner
$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
-Wl,-dynamic-linker,/system/bin/linker64 \
+ -Wl,--gc-sections \
-Wl,-z,nocopyreloc \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \
@@ -213,6 +211,7 @@
define transform-o-to-static-executable-inner
$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
+ -Wl,--gc-sections \
-o $@ \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 3ecad4c..0d3fb70 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -67,6 +67,9 @@
webview \
wifi-service
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml
+
# The order of PRODUCT_BOOT_JARS matters.
PRODUCT_BOOT_JARS := \
core \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 43de63d..4d49121 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -62,6 +62,7 @@
libsqlite_jni \
libwilhelm \
make_ext4fs \
+ nullwebview \
screencap \
sensorservice \
uiautomator \
@@ -79,7 +80,8 @@
framework2 \
android.policy \
services \
- apache-xml
+ apache-xml \
+ nullwebview
PRODUCT_RUNTIMES := runtime_libdvm_default
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 522b237..688d048 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -4094,6 +4094,7 @@
width: 26px;
height: 25px;
background: url(../images/dac_logo.png);
+ background-image: -webkit-image-set(url(../images/dac_logo.png) 1x, url(../images/dac_logo@2x.png) 2x);
z-index: 52;
position: relative;
}