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

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

reconcile forked froyos 

Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
parents fa3d88f8 d5c217ac

core/binary.mk

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
## Sanity check for LOCAL_NDK_VERSION

######################################

my_ndk_version_root :=

ifeq ($(TARGET_SIMULATOR),true)

  # NDK does not support sim build.

  LOCAL_NDK_VERSION :=

endif

ifdef LOCAL_NDK_VERSION

  ifdef LOCAL_IS_HOST_MODULE

    $(error $(LOCAL_PATH): LOCAL_NDK_VERSION can not be used in host module)

core/main.mk

+4 −2
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),) 
  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y

endif



ifeq (,$(TARGET_BUILD_APPS))

# Install an apns-conf.xml file if one's not already being installed.

ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))

  PRODUCT_COPY_FILES += \
@@ -303,7 +302,6 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) 
    endif

  endif

endif

endif # !TARGET_BUILD_APPS



ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
@@ -747,6 +745,10 @@ endif # TARGET_BUILD_APPS 
.PHONY: droid tests

tests: droidcore



# phony target that include any targets in $(ALL_MODULES)

.PHONY: all_modules

all_modules: $(ALL_MODULES)



.PHONY: docs

docs: $(ALL_DOCS)

envsetup.sh

+4 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ function mm() 
        elif [ ! "$M" ]; then

            echo "Couldn't locate a makefile from the current directory."

        else

            ONE_SHOT_MAKEFILE=$M make -C $T files $@

            ONE_SHOT_MAKEFILE=$M make -C $T all_modules $@

        fi

    fi

}
@@ -668,13 +668,15 @@ function mmm() 
                    ARGS="$ARGS snod"

                elif [ "$DIR" = showcommands ]; then

                    ARGS="$ARGS showcommands"

                elif [ "$DIR" = dist ]; then

                    ARGS="$ARGS dist"

                else

                    echo "No Android.mk in $DIR."

                    return 1

                fi

            fi

        done

        ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS files $ARGS

        ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS all_modules $ARGS

    else

        echo "Couldn't locate the top of the tree.  Try setting TOP."

    fi

tools/droiddoc/templates/assets/android-developer-docs.css

+2 −1
Original line number Diff line number Diff line
@@ -884,7 +884,8 @@ p.table-caption { 
  text-decoration:none;

}



#qv a {

#qv a,

#qv a code {

  color:#cc6600;

}