diff options
| author | Raphael Moll <ralf@android.com> | 2013-02-05 10:55:22 -0800 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-02-06 19:55:53 -0800 |
| commit | b15ea7875a9a4101d4be7e547950b7d2b64c1464 (patch) | |
| tree | 6523e17c6056b4bbff28648323ec2150518b6cf4 /lint/cli | |
| parent | 4ae82e1d50430c049c4c4fb520cb32c55c651654 (diff) | |
| download | sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.zip sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.gz sdk-b15ea7875a9a4101d4be7e547950b7d2b64c1464.tar.bz2 | |
Change more SDK libs to prebuilts.
Requires prebuilds/devtools.git I913a29e5f40db99871701461aad6fc38483015d2
To update the prebuilts, you need tools/base.git and the
prebuilts/devtools/update_jars.sh script.
This is supposed to be an intermediary step as we switch to tools/base.
Change-Id: I3dcccfdd9dc243a22a5bfd9db6779d24285db1ac
Diffstat (limited to 'lint/cli')
| -rw-r--r-- | lint/cli/Android.mk | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/lint/cli/Android.mk b/lint/cli/Android.mk index dcd1792..00c736b 100644 --- a/lint/cli/Android.mk +++ b/lint/cli/Android.mk @@ -1,14 +1,26 @@ # Copyright 2011 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. +# LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) -LOCAL_JAVA_RESOURCE_DIRS := src/main/java - -LOCAL_JAR_MANIFEST := etc/manifest.txt +# The lint code has moved to tools/base/lint. +# The rule below uses the prebuilt lint.jar. +# +# If you want to run the tests, cd to tools/base/lint +# and run ./gradlew :lint:test -# If the dependency list is changed, etc/manifest.txt LOCAL_JAVA_LIBRARIES := \ common \ sdklib \ @@ -23,21 +35,8 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_MODULE := lint LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_JAVA_LIBRARY) - - -# Build all sub-directories -include $(call all-makefiles-under,$(LOCAL_PATH)) - -# Build tests -include $(CLEAR_VARS) - -# Only compile source java files in this lib. -LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) - -LOCAL_MODULE := lint_checks-tests -LOCAL_MODULE_TAGS := optional +LOCAL_PREBUILT_JAVA_LIBRARIES := \ + ../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX) -LOCAL_JAVA_LIBRARIES := common sdklib lint_api lint_checks lint junit easymock asm-tools asm-tree-tools guava-tools layoutlib_api sdktestutils +include $(BUILD_HOST_PREBUILT) -include $(BUILD_HOST_JAVA_LIBRARY) |