am 2e939805: Reconcile with jb-mr1-release - do not merge
* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
JOP40C
JOP40B
diff --git a/core/Makefile b/core/Makefile
index e0f6da8..19f2491 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -578,7 +578,7 @@
# Recovery image
# If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true
-ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY) $(BUILD_TINY_ANDROID)))
+ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))
INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
diff --git a/core/binary.mk b/core/binary.mk
index 791623b..57c85c2 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -119,7 +119,7 @@
endif
# Add in libcompiler-rt for all regular device builds
-ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(BUILD_TINY_ANDROID))
+ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
endif
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 5d55534..dd852a1 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -59,6 +59,7 @@
LOCAL_INTERMEDIATE_SOURCE_DIR:=
LOCAL_JAVACFLAGS:=
LOCAL_JAVA_LIBRARIES:=
+LOCAL_JAVA_LAYERS_FILE:=
LOCAL_NO_STANDARD_LIBRARIES:=
LOCAL_CLASSPATH:=
LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=
diff --git a/core/definitions.mk b/core/definitions.mk
index 06db960..986837b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1475,6 +1475,8 @@
\@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \
|| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \
fi
+$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \
+ $(PRIVATE_JAVA_LAYERS_FILE) \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq,)
$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list
$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
$(if $(PRIVATE_JAR_EXCLUDE_FILES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index 5930da6..c938d57 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -43,6 +43,10 @@
include $(BUILD_SYSTEM)/base_rules.mk
+# The layers file allows you to enforce a layering between java packages.
+# Run build/tools/java-layers.py for more details.
+layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))
+
ifeq ($(LOCAL_BUILD_HOST_DEX),true)
$(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes
@@ -51,9 +55,11 @@
$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
+$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=
-$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file)
+$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \
+ $(jar_manifest_file) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-host-java-to-package)
# Run jarjar if necessary, otherwise just copy the file.
@@ -90,6 +96,8 @@
else
$(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
$(LOCAL_BUILT_MODULE): PRIVATE_JAR_EXCLUDE_FILES :=
-$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file)
+$(LOCAL_BUILT_MODULE): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
+$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \
+ $(jar_manifest_file) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-host-java-to-package)
endif # LOCAL_BUILD_HOST_DEX
diff --git a/core/java.mk b/core/java.mk
index 99e67f4..65c9be9 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -254,6 +254,11 @@
$(hide) $(ACP) -fp $(PRIVATE_SOURCE_FILE) $@
ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar)
+# The layers file allows you to enforce a layering between java packages.
+# Run build/tools/java-layers.py for more details.
+layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))
+$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
+
# Compile the java files to a .jar file.
# This intentionally depends on java_sources, not all_java_sources.
# Deps for generated source files must be handled separately,
@@ -261,8 +266,9 @@
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)
$(full_classes_compiled_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
-$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) \
- $(RenderScript_file_stamp) $(proto_java_sources_file_stamp)
+$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \
+ $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \
+ $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-java-to-classes.jar)
# All of the rules after full_classes_compiled_jar are very unlikely
diff --git a/core/main.mk b/core/main.mk
index 87488f4..9f9fd86 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -453,25 +453,6 @@
endif
else # !SDK_ONLY
-ifeq ($(BUILD_TINY_ANDROID), true)
-
-# TINY_ANDROID is a super-minimal build configuration, handy for board
-# bringup and very low level debugging
-
-subdirs := \
- bionic \
- system/core \
- system/extras/ext4_utils \
- system/extras/su \
- build/libs \
- build/target \
- build/tools/acp \
- external/gcc-demangle \
- external/mksh \
- external/openssl \
- external/yaffs2 \
- external/zlib
-else # !BUILD_TINY_ANDROID
#
# Typical build; include any Android.mk files we can find.
#
@@ -479,8 +460,6 @@
FULL_BUILD := true
-endif # !BUILD_TINY_ANDROID
-
endif # !SDK_ONLY
# Before we go and include all of the module makefiles, stash away
@@ -777,10 +756,6 @@
.PHONY: bootimage
bootimage: $(INSTALLED_BOOTIMAGE_TARGET)
-ifeq ($(BUILD_TINY_ANDROID), true)
-INSTALLED_RECOVERYIMAGE_TARGET :=
-endif
-
# Build files and then package it into the rom formats
.PHONY: droidcore
droidcore: files \
diff --git a/core/tasks/apicheck.mk b/core/tasks/apicheck.mk
index 8d9928e..63fd4d4 100644
--- a/core/tasks/apicheck.mk
+++ b/core/tasks/apicheck.mk
@@ -17,8 +17,8 @@
# api compatibility or added apis illegally.
#
-# skip api check for TINY_ANDROID and PDK buid
-ifeq (,$(filter true, $(BUILD_TINY_ANDROID) $(TARGET_BUILD_PDK)))
+# skip api check for PDK buid
+ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK)))
.PHONY: checkapi
diff --git a/core/tasks/factory_bundle.mk b/core/tasks/factory_bundle.mk
index 06d7a78..5c5adc3 100644
--- a/core/tasks/factory_bundle.mk
+++ b/core/tasks/factory_bundle.mk
@@ -15,6 +15,7 @@
#
ifeq (,$(ONE_SHOT_MAKEFILE))
+ifneq ($(TARGET_BUILD_PDK),true)
# PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>[:<install_path>...]" tuples.
# <install_path> is relative to the staging directory for the bundle.
@@ -76,5 +77,6 @@
endif
+endif # TARGET_BUILD_PDK
endif # ONE_SHOT_MAKEFILE
diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk
index 38a5887..579fd6a 100644
--- a/core/tasks/factory_ramdisk.mk
+++ b/core/tasks/factory_ramdisk.mk
@@ -15,6 +15,7 @@
#
ifeq (,$(ONE_SHOT_MAKEFILE))
+ifneq ($(TARGET_BUILD_PDK),true)
# PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>[:<install_path>...]" tuples.
# <install_path> is relative to TARGET_FACTORY_RAMDISK_OUT.
@@ -87,4 +88,5 @@
endif
+endif # TARGET_BUILD_PDK
endif # ONE_SHOT_MAKEFILE
diff --git a/target/product/base.mk b/target/product/base.mk
index 9d8ef3f..68fed42 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -18,74 +18,46 @@
PRODUCT_PACKAGES += \
20-dns.conf \
95-configured \
- adb \
- adbd \
am \
android.policy \
android.test.runner \
app_process \
applypatch \
bmgr \
- bootanimation \
bugreport \
content \
dbus-daemon \
- debuggerd \
dhcpcd \
dhcpcd-run-hooks \
dnsmasq \
- dumpstate \
- dumpsys \
framework \
fsck_msdos \
- gralloc.default \
- gzip \
ime \
- init \
- input \
javax.obex \
- libEGL \
- libETC1 \
- libFFTEm \
- libGLES_android \
- libGLESv1_CM \
- libGLESv2 \
libSR_AudioIn \
libandroid \
libandroid_runtime \
libandroid_servers \
libaudioeffect_jni \
libaudioflinger \
- libbinder \
libbundlewrapper \
- libc \
libcamera_client \
libcameraservice \
libchromium_net \
- libctest \
- libcutils \
libdbus \
libdl \
libdrm1 \
libdrm1_jni \
libeffects \
- libgui \
- libhardware \
- libhardware_legacy \
libiprouteutil \
libjni_latinime \
libjnigraphics \
- libjpeg \
- liblog \
- libm \
libmedia \
libmedia_jni \
libmediaplayerservice \
libmtp \
libnetlink \
libnetutils \
- libpixelflinger \
- libpower \
libreference-ril \
libreverbwrapper \
libril \
@@ -102,24 +74,13 @@
libstagefright_foundation \
libstagefright_omx \
libstagefright_yuv \
- libstdc++ \
- libstlport \
- libsurfaceflinger \
- libsurfaceflinger_client \
- libsurfaceflinger_ddmconnection \
libsystem_server \
- libsysutils \
- libthread_db \
- libui \
libusbhost \
libutils \
libvisualizer \
libvorbisidec \
libwebcore \
libwpa_client \
- linker \
- logcat \
- logwrapper \
mediaserver \
monkey \
mtpd \
@@ -135,15 +96,13 @@
schedtest \
screenshot \
sdcard \
- service \
- servicemanager \
services \
settings \
- surfaceflinger \
svc \
system_server \
tc \
- toolbox \
vdc \
vold
+$(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk)
+
diff --git a/target/product/core.mk b/target/product/core.mk
index 831298a..3e3e578 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -134,10 +134,6 @@
zoneinfo.idx \
zoneinfo.version
-PRODUCT_COPY_FILES += \
- system/core/rootdir/init.usb.rc:root/init.usb.rc \
- system/core/rootdir/init.trace.rc:root/init.trace.rc \
-
# host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
new file mode 100644
index 0000000..7f681b1
--- /dev/null
+++ b/target/product/embedded.mk
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2009 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.
+#
+
+# This is a build configuration for a very minimal build of the
+# Open-Source part of the tree.
+
+PRODUCT_PACKAGES += \
+ adb \
+ adbd \
+ bootanimation \
+ debuggerd \
+ dumpstate \
+ dumpsys \
+ gralloc.default \
+ gzip \
+ init \
+ input \
+ libEGL \
+ libETC1 \
+ libFFTEm \
+ libGLES_android \
+ libGLESv1_CM \
+ libGLESv2 \
+ libbinder \
+ libc \
+ libctest \
+ libcutils \
+ libdl \
+ libgui \
+ libhardware \
+ libhardware_legacy \
+ libjpeg \
+ liblog \
+ libm \
+ libpixelflinger \
+ libpower \
+ libstdc++ \
+ libstlport \
+ libsurfaceflinger \
+ libsurfaceflinger_client \
+ libsurfaceflinger_ddmconnection \
+ libsysutils \
+ libthread_db \
+ libui \
+ libutils \
+ linker \
+ logcat \
+ logwrapper \
+ service \
+ servicemanager \
+ surfaceflinger \
+ toolbox
+
+# SELinux packages
+PRODUCT_PACKAGES += \
+ sepolicy \
+ file_contexts \
+ seapp_contexts \
+ property_contexts \
+ mac_permissions.xml
+
+PRODUCT_COPY_FILES += \
+ system/core/rootdir/init.usb.rc:root/init.usb.rc \
+ system/core/rootdir/init.trace.rc:root/init.trace.rc \
diff --git a/tools/java-layers.py b/tools/java-layers.py
new file mode 100755
index 0000000..b3aec2b
--- /dev/null
+++ b/tools/java-layers.py
@@ -0,0 +1,257 @@
+#!/usr/bin/env python
+
+import os
+import re
+import sys
+
+def fail_with_usage():
+ sys.stderr.write("usage: java-layers.py DEPENDENCY_FILE SOURCE_DIRECTORIES...\n")
+ sys.stderr.write("\n")
+ sys.stderr.write("Enforces layering between java packages. Scans\n")
+ sys.stderr.write("DIRECTORY and prints errors when the packages violate\n")
+ sys.stderr.write("the rules defined in the DEPENDENCY_FILE.\n")
+ sys.stderr.write("\n")
+ sys.stderr.write("Prints a warning when an unknown package is encountered\n")
+ sys.stderr.write("on the assumption that it should fit somewhere into the\n")
+ sys.stderr.write("layering.\n")
+ sys.stderr.write("\n")
+ sys.stderr.write("DEPENDENCY_FILE format\n")
+ sys.stderr.write(" - # starts comment\n")
+ sys.stderr.write(" - Lines consisting of two java package names: The\n")
+ sys.stderr.write(" first package listed must not contain any references\n")
+ sys.stderr.write(" to any classes present in the second package, or any\n")
+ sys.stderr.write(" of its dependencies.\n")
+ sys.stderr.write(" - Lines consisting of one java package name: The\n")
+ sys.stderr.write(" packge is assumed to be a high level package and\n")
+ sys.stderr.write(" nothing may depend on it.\n")
+ sys.stderr.write(" - Lines consisting of a dash (+) followed by one java\n")
+ sys.stderr.write(" package name: The package is considered a low level\n")
+ sys.stderr.write(" package and may not import any of the other packages\n")
+ sys.stderr.write(" listed in the dependency file.\n")
+ sys.stderr.write(" - Lines consisting of a plus (-) followed by one java\n")
+ sys.stderr.write(" package name: The package is considered \'legacy\'\n")
+ sys.stderr.write(" and excluded from errors.\n")
+ sys.stderr.write("\n")
+ sys.exit(1)
+
+class Dependency:
+ def __init__(self, filename, lineno, lower, top, lowlevel, legacy):
+ self.filename = filename
+ self.lineno = lineno
+ self.lower = lower
+ self.top = top
+ self.lowlevel = lowlevel
+ self.legacy = legacy
+ self.uppers = []
+ self.transitive = set()
+
+ def matches(self, imp):
+ for d in self.transitive:
+ if imp.startswith(d):
+ return True
+ return False
+
+class Dependencies:
+ def __init__(self, deps):
+ def recurse(obj, dep, visited):
+ global err
+ if dep in visited:
+ sys.stderr.write("%s:%d: Circular dependency found:\n"
+ % (dep.filename, dep.lineno))
+ for v in visited:
+ sys.stderr.write("%s:%d: Dependency: %s\n"
+ % (v.filename, v.lineno, v.lower))
+ err = True
+ return
+ visited.append(dep)
+ for upper in dep.uppers:
+ obj.transitive.add(upper)
+ if upper in deps:
+ recurse(obj, deps[upper], visited)
+ self.deps = deps
+ self.parts = [(dep.lower.split('.'),dep) for dep in deps.itervalues()]
+ # transitive closure of dependencies
+ for dep in deps.itervalues():
+ recurse(dep, dep, [])
+ # disallow everything from the low level components
+ for dep in deps.itervalues():
+ if dep.lowlevel:
+ for d in deps.itervalues():
+ if dep != d and not d.legacy:
+ dep.transitive.add(d.lower)
+ # disallow the 'top' components everywhere but in their own package
+ for dep in deps.itervalues():
+ if dep.top and not dep.legacy:
+ for d in deps.itervalues():
+ if dep != d and not d.legacy:
+ d.transitive.add(dep.lower)
+ for dep in deps.itervalues():
+ dep.transitive = set([x+"." for x in dep.transitive])
+ if False:
+ for dep in deps.itervalues():
+ print "-->", dep.lower, "-->", dep.transitive
+
+ # Lookup the dep object for the given package. If pkg is a subpackage
+ # of one with a rule, that one will be returned. If no matches are found,
+ # None is returned.
+ def lookup(self, pkg):
+ # Returns the number of parts that match
+ def compare_parts(parts, pkg):
+ if len(parts) > len(pkg):
+ return 0
+ n = 0
+ for i in range(0, len(parts)):
+ if parts[i] != pkg[i]:
+ return 0
+ n = n + 1
+ return n
+ pkg = pkg.split(".")
+ matched = 0
+ result = None
+ for (parts,dep) in self.parts:
+ x = compare_parts(parts, pkg)
+ if x > matched:
+ matched = x
+ result = dep
+ return result
+
+def parse_dependency_file(filename):
+ global err
+ f = file(filename)
+ lines = f.readlines()
+ f.close()
+ def lineno(s, i):
+ i[0] = i[0] + 1
+ return (i[0],s)
+ n = [0]
+ lines = [lineno(x,n) for x in lines]
+ lines = [(n,s.split("#")[0].strip()) for (n,s) in lines]
+ lines = [(n,s) for (n,s) in lines if len(s) > 0]
+ lines = [(n,s.split()) for (n,s) in lines]
+ deps = {}
+ for n,words in lines:
+ if len(words) == 1:
+ lower = words[0]
+ top = True
+ legacy = False
+ lowlevel = False
+ if lower[0] == '+':
+ lower = lower[1:]
+ top = False
+ lowlevel = True
+ elif lower[0] == '-':
+ lower = lower[1:]
+ legacy = True
+ if lower in deps:
+ sys.stderr.write(("%s:%d: Package '%s' already defined on"
+ + " line %d.\n") % (filename, n, lower, deps[lower].lineno))
+ err = True
+ else:
+ deps[lower] = Dependency(filename, n, lower, top, lowlevel, legacy)
+ elif len(words) == 2:
+ lower = words[0]
+ upper = words[1]
+ if lower in deps:
+ dep = deps[lower]
+ if dep.top:
+ sys.stderr.write(("%s:%d: Can't add dependency to top level package "
+ + "'%s'\n") % (filename, n, lower))
+ err = True
+ else:
+ dep = Dependency(filename, n, lower, False, False, False)
+ deps[lower] = dep
+ dep.uppers.append(upper)
+ else:
+ sys.stderr.write("%s:%d: Too many words on line starting at \'%s\'\n" % (
+ filename, n, words[2]))
+ err = True
+ return Dependencies(deps)
+
+def find_java_files(srcs):
+ result = []
+ for d in srcs:
+ if d[0] == '@':
+ f = file(d[1:])
+ result.extend([fn for fn in [s.strip() for s in f.readlines()]
+ if len(fn) != 0])
+ f.close()
+ else:
+ for root, dirs, files in os.walk(d):
+ result.extend([os.sep.join((root,f)) for f in files
+ if f.lower().endswith(".java")])
+ return result
+
+COMMENTS = re.compile("//.*?\n|/\*.*?\*/", re.S)
+PACKAGE = re.compile("package\s+(.*)")
+IMPORT = re.compile("import\s+(.*)")
+
+def examine_java_file(deps, filename):
+ global err
+ # Yes, this is a crappy java parser. Write a better one if you want to.
+ f = file(filename)
+ text = f.read()
+ f.close()
+ text = COMMENTS.sub("", text)
+ index = text.find("{")
+ if index < 0:
+ sys.stderr.write(("%s: Error: Unable to parse java. Can't find class "
+ + "declaration.\n") % filename)
+ err = True
+ return
+ text = text[0:index]
+ statements = [s.strip() for s in text.split(";")]
+ # First comes the package declaration. Then iterate while we see import
+ # statements. Anything else is either bad syntax that we don't care about
+ # because the compiler will fail, or the beginning of the class declaration.
+ m = PACKAGE.match(statements[0])
+ if not m:
+ sys.stderr.write(("%s: Error: Unable to parse java. Missing package "
+ + "statement.\n") % filename)
+ err = True
+ return
+ pkg = m.group(1)
+ imports = []
+ for statement in statements[1:]:
+ m = IMPORT.match(statement)
+ if not m:
+ break
+ imports.append(m.group(1))
+ # Do the checking
+ if False:
+ print filename
+ print "'%s' --> %s" % (pkg, imports)
+ dep = deps.lookup(pkg)
+ if not dep:
+ sys.stderr.write(("%s: Error: Package does not appear in dependency file: "
+ + "%s\n") % (filename, pkg))
+ err = True
+ return
+ for imp in imports:
+ if dep.matches(imp):
+ sys.stderr.write("%s: Illegal import in package '%s' of '%s'\n"
+ % (filename, pkg, imp))
+ err = True
+
+err = False
+
+def main(argv):
+ if len(argv) < 3:
+ fail_with_usage()
+ deps = parse_dependency_file(argv[1])
+
+ if err:
+ sys.exit(1)
+
+ java = find_java_files(argv[2:])
+ for filename in java:
+ examine_java_file(deps, filename)
+
+ if err:
+ sys.stderr.write("%s: Using this file as dependency file.\n" % argv[1])
+ sys.exit(1)
+
+ sys.exit(0)
+
+if __name__ == "__main__":
+ main(sys.argv)
+