diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-17 14:40:12 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-17 16:49:05 -0700 |
| commit | fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d (patch) | |
| tree | 5fc7f5b941724a62f8e3411df09fae431ff5e3cf /Android.mk | |
| parent | 56d947fbc9bc2992e2f93112fafb73e50d2aaa7a (diff) | |
| download | art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.zip art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.gz art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.bz2 | |
Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -78,8 +78,11 @@ clean-oat-target: adb shell rm system/app/*.odex adb shell rm data/run-test/test-*/dalvik-cache/*@classes.dex +######################################################################## +# darwin build + # we aren't building most of art on darwin right now, but we do need to build new dalvikvm -ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86) +ifeq ($(HOST_OS),darwin) art_dont_bother := true include $(art_path)/dalvikvm/Android.mk endif @@ -325,14 +328,21 @@ dump-oat-Calculator: $(TARGET_OUT_APPS)/Calculator.odex $(TARGET_BOOT_IMG_OUT) $ endif ######################################################################## -# cpplint target +# cpplint targets to style check art source files -# "mm cpplint-art" to style check art source files +# "mm cpplint-art" to verify we aren't regressing .PHONY: cpplint-art cpplint-art: ./art/tools/cpplint.py \ - --filter=-whitespace/comments,-whitespace/line_length,-build/include,-build/header_guard,-readability/function,-readability/streams,-readability/todo,-runtime/references \ - $(ANDROID_BUILD_TOP)/art/src/*.h $(ANDROID_BUILD_TOP)/art/src/*.cc + --filter=-,+build/header_guard, \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) + +# "mm cpplint-art-aspirational" to see warnings we would like to fix +.PHONY: cpplint-art-aspirational +cpplint-art-aspirational: + ./art/tools/cpplint.py \ + --filter=-whitespace/comments,-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) ######################################################################## # targets to switch back and forth from libdvm to libart |