Merge "Enable TLS register by default for ARMv7a arch"
diff --git a/core/user_tags.mk b/core/user_tags.mk
index f10ed27..53f0ee2 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -471,7 +471,6 @@
sig-create \
signapk \
signature-tools \
- simg2img \
spec-progress \
sqlite3 \
stack_dump \
diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk
index 4edcc19..ee8e273 100644
--- a/target/board/generic/device.mk
+++ b/target/board/generic/device.mk
@@ -28,4 +28,5 @@
development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \
PRODUCT_PACKAGES := \
- audio.primary.goldfish
+ audio.primary.goldfish \
+ power.goldfish
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 2fa42f8..2cd26d4 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -58,7 +58,8 @@
PRODUCT_PACKAGES += \
audio.primary.default \
audio_policy.default \
- local_time.default
+ local_time.default \
+ power.default
PRODUCT_COPY_FILES := \
system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 4cb4434..2e40401 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -131,7 +131,8 @@
# audio libraries.
PRODUCT_PACKAGES += \
audio.primary.goldfish \
- audio_policy.default
+ audio_policy.default \
+ local_time.default
PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp
index 0705be3..8057068 100644
--- a/tools/zipalign/ZipFile.cpp
+++ b/tools/zipalign/ZipFile.cpp
@@ -20,7 +20,7 @@
#define LOG_TAG "zip"
-#include <utils/ZipUtils.h>
+#include <androidfw/ZipUtils.h>
#include <utils/Log.h>
#include "ZipFile.h"