am c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs
* commit 'c438082fd2dde771f0b3f1628777a3e2bd12214f':
docs: add sampleindex file for droiddoc to customize the breadcrumbs
diff --git a/core/binary.mk b/core/binary.mk
index 88c356a..b9e884e 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -388,6 +388,7 @@
$(gen_asm_objects) \
$(c_objects) \
$(gen_c_objects) \
+ $(objc_objects) \
$(yacc_objects) \
$(lex_objects) \
$(proto_generated_objects) \
diff --git a/core/build_id.mk b/core/build_id.mk
index a2ce12f..e954794 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -23,7 +23,7 @@
# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
#
-BUILD_ID := HONEYCOMB
+BUILD_ID := OPENMASTER
# DISPLAY_BUILD_NUMBER should only be set for development branches,
# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
diff --git a/core/definitions.mk b/core/definitions.mk
index ea47f6b..2b77f8e 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1029,7 +1029,7 @@
$(call transform-host-c-or-s-to-o-no-deps)
endef
-define tranform-host-m-to-o
+define transform-host-m-to-o
$(transform-host-m-to-o-no-deps)
$(transform-d-to-p)
endef
diff --git a/core/main.mk b/core/main.mk
index 10a01ce..6c53b8a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -425,6 +425,7 @@
sdk/archquery \
sdk/androidprefs \
sdk/apkbuilder \
+ sdk/common \
sdk/ddms \
sdk/hierarchyviewer2 \
sdk/ide_common \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8bd5a0f..23e45a2 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -59,7 +59,7 @@
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
- PLATFORM_VERSION_CODENAME := REL
+ PLATFORM_VERSION_CODENAME := AOSP
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
@@ -96,4 +96,3 @@
# anyone trying to parse it as an integer will probably get "0".
BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
endif
-
diff --git a/target/board/generic_x86/init.rc b/target/board/generic_x86/init.rc
index 38edcc1..8f6be28 100644
--- a/target/board/generic_x86/init.rc
+++ b/target/board/generic_x86/init.rc
@@ -324,6 +324,7 @@
service netd /system/bin/netd
socket netd stream 0660 root system
+ socket dnsproxyd stream 0660 root inet
service debuggerd /system/bin/debuggerd
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 476cfd1..7756440 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -224,7 +224,7 @@
</style>
<?cs /if ?>
<?cs /if ?> <?cs # end if/else online ?>
-
+
<?cs /if ?> <?cs # end if/else NDK ?>
<?cs /if ?> <?cs # end if/else redirect ?>