Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
diff --git a/core/java.mk b/core/java.mk
index b73bc93..ebfff18 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -206,6 +206,11 @@
$(renderscript_intermediate.COMMON)/res/raw/, $(bc_files))
renderscript_intermediate := $(intermediates)/renderscript
+
+# We don't need the .so files in bundled branches
+# Prevent these from showing up on the device
+ifneq (,$(TARGET_BUILD_APPS))
+
rs_compatibility_jni_libs := $(addprefix \
$(renderscript_intermediate)/librs., \
$(patsubst %.bc,%.so, $(bc_files)))
@@ -216,6 +221,8 @@
rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so
LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni
+
+
$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \
$(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)
$(rs_compatibility_jni_libs): $(BCC_COMPAT)
@@ -226,6 +233,8 @@
endif
+endif
+
# include the dependency files (.d) generated by llvm-rs-cc.
renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/, \
$(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources)))))
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 1b585cb..6e72a38 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -462,7 +462,8 @@
.next-page-link:after,
.start-class-link:after,
.start-course-link:after,
- .next-class-link:after {
+ .next-class-link:after,
+ .go-link:after {
content: '';
background: transparent url(../images/styles/disclosure_right.png) no-repeat scroll 50% 50%;
width: 10px;
@@ -2614,6 +2615,39 @@
background-image: url(../images/styles/disclosure_up.png);
}
+/* notice sidebox link used in Design docs */
+a.notice-developers {
+ float:right;
+ width:240px;
+ min-height:50px;
+ margin:0 0 20px 20px;
+ border:1px solid #ddd;
+}
+a.notice-developers div {
+ min-height:40px;
+ background:url('../images/styles/notice-developers.png') no-repeat 10px 10px;
+ padding:10px 10px 10px 60px;
+}
+a.notice-developers:hover {
+ background:#eee;
+}
+a.notice-developers h3 {
+ font-size:14px;
+ font-weight:normal;
+ text-transform:uppercase;
+ color:#000 !important;
+ margin:0;
+}
+a.notice-developers p {
+ margin:0;
+ line-height:16px;
+}
+a.notice-developers.left {
+ margin-left:0;
+ float:left;
+}
+
+
/* -----------------------------------------------
good/bad example containers
*/
@@ -4429,6 +4463,19 @@
margin-right: 0px;
}
+.distribute-features .distribute-link li a {
+ color:red !important;
+}
+
+.distribute-features .distribute-link li a,
+.distribute-features .distribute-link li a:active {
+ color:#555 !important;
+}
+
+.distribute-features .distribute-link li a:hover,
+.distribute-features .distribute-link li a:hover * {
+ color:#7AA1B0 !important;
+}
/************ DEVELOP TOPIC CONTAINERS ************/
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
new file mode 100644
index 0000000..dd04606
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-developers.png
Binary files differ
