Merge branch 'eclair' into eclair-release

This commit is contained in:
android-build SharedAccount
2009-10-06 18:58:23 -07:00
3 changed files with 33 additions and 23 deletions

View File

@@ -21,6 +21,30 @@
# "buildspec.mk" should never be checked in to source control.
######################################################################
# Choose a product to build for. Look in the products directory for ones
# that work.
ifndef TARGET_PRODUCT
#TARGET_PRODUCT:=generic
endif
# Choose a variant to build. If you don't pick one, the default is eng.
# User is what we ship. Userdebug is that, with a few flags turned on
# for debugging. Eng has lots of extra tools for development.
ifndef TARGET_BUILD_VARIANT
#TARGET_BUILD_VARIANT:=user
#TARGET_BUILD_VARIANT:=userdebug
#TARGET_BUILD_VARIANT:=eng
endif
# Choose additional targets to always install, even when building
# minimal targets like "make droid". This takes simple target names
# like "Browser" or "MyApp", the names used by LOCAL_MODULE or
# LOCAL_PACKAGE_NAME. Modules listed here will always be installed in
# /system, even if they'd usually go in /data.
ifndef CUSTOM_MODULES
#CUSTOM_MODULES:=
endif
# Uncomment this if you want the simulator, otherwise, build for arm
ifndef TARGET_SIMULATOR
#TARGET_SIMULATOR:=true
@@ -50,21 +74,6 @@ endif
#HOST_CUSTOM_DEBUG_CFLAGS:=
#TARGET_CUSTOM_DEBUG_CFLAGS:=
# Choose a product to build for. Look in the products directory for ones
# that work.
ifndef TARGET_PRODUCT
#TARGET_PRODUCT:=generic
endif
# Choose additional targets to always install, even when building
# minimal targets like "make droid". This takes simple target names
# like "Browser" or "MyApp", the names used by LOCAL_MODULE or
# LOCAL_PACKAGE_NAME. Modules listed here will always be installed in
# /system, even if they'd usually go in /data.
ifndef CUSTOM_MODULES
#CUSTOM_MODULES:=
endif
# Choose additional locales, like "en_US" or "it_IT", to add to any
# built product. Any locales that appear in CUSTOM_LOCALES but not in
# the locale list for the selected product will be added to the end

View File

@@ -339,7 +339,6 @@ links to summary tables) */
}
#api-level-toggle {
float:right;
padding:0 10px;
font-size:11px;
color:#999;

View File

@@ -460,8 +460,8 @@ def dumpseverity(sev):
def classifywarning(line):
for i in warnpatterns:
for pat in i['patterns']:
if re.match(pat, line):
for cpat in i['compiledpatterns']:
if cpat.match(line):
i['members'].append(line)
return
else:
@@ -470,7 +470,12 @@ def classifywarning(line):
# 2 or more concurrent compiles
pass
# precompiling every pattern speeds up parsing by about 30x
def compilepatterns():
for i in warnpatterns:
i['compiledpatterns'] = []
for pat in i['patterns']:
i['compiledpatterns'].append(re.compile(pat))
infile = open(sys.argv[1], 'r')
warnings = []
@@ -481,6 +486,7 @@ targetvariant = 'unknown'
linecounter = 0
warningpattern = re.compile('.* warning:.*')
compilepatterns()
# read the log file and classify all the warnings
lastmatchedline = ''
@@ -515,7 +521,3 @@ dumpseverity(severity.HARMLESS)
dumpseverity(severity.UNKNOWN)
dumpfixed()