Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f122bec4 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

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

parent 760cda0e

cleanspec.mk

+1 −0
Original line number Diff line number Diff line
@@ -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/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/APPS/PinyinIME_intermediates)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/build_id.mk

+1 −1
Original line number Diff line number Diff line 
# This branch was born out of a naming conventions fix.

# The decision was to keep the RC names the same.

export BUILD_ID=CRA71C
 
export BUILD_ID=CRA77

target/product/generic.mk

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ PRODUCT_PACKAGES := \ 
    Camera \

    DrmProvider \

    LatinIME \

    Launcher \

    Mms \

    Music \

    Settings \

tools/droiddoc/src/ClassInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco 
        ClassInfo cl = this;

        while (cl != null) {

            PackageInfo pkg = cl.containingPackage();

            if (pkg.isHidden()) {

            if (pkg != null && pkg.isHidden()) {

                return true;

            }

            if (cl.comment().isHidden()) {