diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-28 10:40:27 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-07-28 10:41:54 -0700 |
| commit | dbaff11c846e16b3a94a209d23e4ef0b4a2ea799 (patch) | |
| tree | c88474d9519029eb34edd52651dd975b96c35437 | |
| parent | fa3d88f8845b1db42da4886faff93db2b53cfcf1 (diff) | |
| parent | d5c217aca18726f0ed9f2ea034f750620d4bdf7d (diff) | |
| download | build-android-cts-2.2_r2.tar.gz | |
reconcile forked froyosandroid-cts-2.2_r2
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
| -rw-r--r-- | core/binary.mk | 4 | ||||
| -rw-r--r-- | core/main.mk | 6 | ||||
| -rw-r--r-- | envsetup.sh | 6 | ||||
| -rw-r--r-- | tools/droiddoc/templates/assets/android-developer-docs.css | 3 |
4 files changed, 14 insertions, 5 deletions
diff --git a/core/binary.mk b/core/binary.mk index da9eca1874..7923fbe1e8 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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) diff --git a/core/main.mk b/core/main.mk index 0b4ca38fd5..11f234e57d 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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) diff --git a/envsetup.sh b/envsetup.sh index 21a66c13e3..4d5bbc35ec 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -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 diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css index da39a4ad73..bc9e98b653 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.css +++ b/tools/droiddoc/templates/assets/android-developer-docs.css @@ -884,7 +884,8 @@ p.table-caption { text-decoration:none; } -#qv a { +#qv a, +#qv a code { color:#cc6600; } |