StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto import from //branches/cupcake_rel/...@140373

Browse Source
This commit is contained in:
The Android Open Source Project
2009-03-18 17:39:42 -07:00
parent 760cda0e37
commit f122bec404
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cleanspec.mk
View File

@@ -70,6 +70,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/l
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIME_intermediates)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

2
core/build_id.mk
View File

@@ -1,3 +1,3 @@
# This branch was born out of a naming conventions fix. # This branch was born out of a naming conventions fix.
# The decision was to keep the RC names the same. # The decision was to keep the RC names the same.
export BUILD_ID=CRA71C export BUILD_ID=CRA77

1
target/product/generic.mk
View File

@@ -9,7 +9,6 @@ PRODUCT_PACKAGES := \
Camera \ Camera \
DrmProvider \ DrmProvider \
LatinIME \ LatinIME \
Launcher \
Mms \ Mms \
Music \ Music \
Settings \ Settings \

2
tools/droiddoc/src/ClassInfo.java
View File

@@ -1193,7 +1193,7 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
ClassInfo cl = this; ClassInfo cl = this;
while (cl != null) { while (cl != null) {
PackageInfo pkg = cl.containingPackage(); PackageInfo pkg = cl.containingPackage();
if (pkg.isHidden()) { if (pkg != null && pkg.isHidden()) {
return true; return true;
} }
if (cl.comment().isHidden()) { if (cl.comment().isHidden()) {