diff options
| -rw-r--r-- | Android.libv8.mk | 15 | ||||
| -rw-r--r-- | Android.mk | 25 | ||||
| -rw-r--r-- | CleanSpec.mk | 49 |
3 files changed, 59 insertions, 30 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index ecaf762e..850df3a4 100644 --- a/Android.libv8.mk +++ b/Android.libv8.mk @@ -31,7 +31,6 @@ $(JS2C_PY): $(intermediates)/%.py : $(LOCAL_PATH)/tools/%.py | $(ACP) @echo "Copying $@" $(copy-file-to-target) -LOCAL_GENERATED_SOURCES := # Generate libraries.cc GEN1 := $(intermediates)/libraries.cc $(intermediates)/libraries-empty.cc $(GEN1): SCRIPT := $(intermediates)/js2c.py @@ -46,15 +45,11 @@ LOCAL_GENERATED_SOURCES += $(V8_GENERATED_LIBRARIES) # Generate snapshot.cc ifeq ($(ENABLE_V8_SNAPSHOT),true) SNAP_GEN := $(intermediates)/snapshot.cc -$(SNAP_GEN): MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot -# mksnapshot is the module name. This dependency rule makes sure that mksnapshot -# is built before calling the following rule. -$(SNAP_GEN): mksnapshot - @echo "Generating snapshot.cc" - @mkdir -p $(dir $@) - @echo $(MKSNAPSHOT) $(SNAP_GEN) - $(MKSNAPSHOT) $(SNAP_GEN) -LOCAL_GENERATED_SOURCES += $(intermediates)/snapshot.cc +MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot +$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) $(SNAP_GEN) +$(SNAP_GEN): $(MKSNAPSHOT) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(SNAP_GEN) else LOCAL_SRC_FILES += \ src/snapshot-empty.cc @@ -27,25 +27,10 @@ include $(CLEAR_VARS) # can be set to true, so that two builds can be different but without # specifying which JS engine to use. -NEED_V8 = false -ifeq ($(JS_ENGINE),v8) - NEED_V8 = true -else - ifneq ($(JS_ENGINE),jsc) - ifeq ($(USE_ALT_JS_ENGINE),true) - NEED_V8 = true - endif - endif -endif - -ifeq ($(NEED_V8),true) - # Build libv8 and v8shell - # Temporarily enable snapshot support. - # TODO(andreip): re-enable this after the experiment - ENABLE_V8_SNAPSHOT = true - ifeq ($(ENABLE_V8_SNAPSHOT),true) +# Build libv8 and v8shell +# TODO: remove the check when the v8 build is fixed for x86 +ifeq ($(TARGET_ARCH),arm) include $(BASE_PATH)/Android.mksnapshot.mk - endif - include $(BASE_PATH)/Android.libv8.mk - include $(BASE_PATH)/Android.v8shell.mk + include $(BASE_PATH)/Android.libv8.mk + include $(BASE_PATH)/Android.v8shell.mk endif diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 00000000..b84e1b65 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,49 @@ +# Copyright (C) 2007 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ |