am 0729ec54: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '0729ec54cdc856990366b401a117daec11c2dc97':
JWQ63
JWQ59D
JWQ59C
JWQ59B
JWQ59
JWQ58
JWQ57
JWQ56C
JWQ56B
JWQ56
JWQ52D
JWQ52C
JWQ52B
JWQ52
JWQ51C
JWQ51B
diff --git a/core/binary.mk b/core/binary.mk
index 18f67fe..dd68fee 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -500,6 +500,12 @@
gen_asm_objects := $(gen_S_objects) $(gen_s_objects)
###########################################################
+## o: Include generated .o files in output.
+###########################################################
+
+gen_o_objects := $(filter %.o,$(LOCAL_GENERATED_SOURCES))
+
+###########################################################
## C: Compile .c files to .o.
###########################################################
@@ -624,7 +630,8 @@
$(yacc_objects) \
$(lex_objects) \
$(proto_generated_objects) \
- $(addprefix $(TOPDIR)$(LOCAL_PATH)/,$(LOCAL_PREBUILT_OBJ_FILES))
+ $(addprefix $(TOPDIR)$(LOCAL_PATH)/,$(LOCAL_PREBUILT_OBJ_FILES)) \
+ $(gen_o_objects)
LOCAL_C_INCLUDES += $(TOPDIR)$(LOCAL_PATH) $(intermediates)
@@ -632,7 +639,9 @@
LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)
endif
-$(all_objects) : | $(LOCAL_GENERATED_SOURCES) $(import_includes)
+# .o files need to be filtered out of LOCAL_GENERATED_SOURCES
+# to avoid creating circular dependencies.
+$(all_objects) : | $(filter-out %.o,$(LOCAL_GENERATED_SOURCES)) $(import_includes)
ALL_C_CPP_ETC_OBJECTS += $(all_objects)
###########################################################
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index b901104..abeaaef 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -31,6 +31,7 @@
FusedLocation \
Gallery2 \
InputDevices \
+ Keyguard \
LatinIME \
Launcher2 \
Music \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index bcaab92..754e5df 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -221,6 +221,7 @@
PRODUCT_PACKAGES += \
TestingCamera \
Home \
+ Keyguard \
SystemUI \
Settings \
libsurfaceflinger_ddmconnection
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 3226423..54373d9 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -24,6 +24,7 @@
Exchange2 \
FusedLocation \
Gallery \
+ Keyguard \
Music \
Mms \
OpenWnn \
