Commit Graph

34390 Commits

Author SHA1 Message Date
Sam Saccone
03aaa7e2d8 Add the ability to save off the CSV to a file.
While we are generating the html file also expose a way for a user to
save off a csv file. This prevents having to run the tool twice.

* Add a new flag called csvpath that takes a file path for the csv dump.
* Use csv.writer to simply print formats.
* Modify the dump_csv and count_severity to take a csv writer.

Test: run with a build.log file, compare before and after html/csv dumps.
Change-Id: I27ed730625a352fdc3fb2928433eb5e8b2ea229c
2017-04-12 18:58:53 -07:00
Simran Basi
d46e933f1d Merge "Revert "Revert "device-tests: As a dependency to tests"""
am: ba0ebe9230

Change-Id: Ieb8c0e229b0aaab42ea5004102cd9081e9cf3eda
2017-04-12 21:15:21 +00:00
Treehugger Robot
ba0ebe9230 Merge "Revert "Revert "device-tests: As a dependency to tests""" 2017-04-12 21:05:08 +00:00
Simran Basi
dce141bce8 Merge "Common testcase directories: Clean up duplicates"
am: 4d15a84fc0

Change-Id: I02267f1f19aaebcd624980945662941096e865eb
2017-04-12 08:16:49 +00:00
Treehugger Robot
4d15a84fc0 Merge "Common testcase directories: Clean up duplicates" 2017-04-12 08:10:20 +00:00
Dan Willemsen
9fc091f756 Merge "Support split /system and /vendor modules from Soong"
am: 4e789c2e57

Change-Id: I877f4898e035bf50f4a7e59d1216e00ba14a3ffd
2017-04-12 00:13:27 +00:00
Dan Willemsen
4e789c2e57 Merge "Support split /system and /vendor modules from Soong" 2017-04-12 00:06:52 +00:00
Colin Cross
004295d3da Merge changes from topic 'anno'
am: 0f8767e535

Change-Id: I00c56c207928056d4c56fe2531615cff6342a955
2017-04-11 18:33:58 +00:00
Treehugger Robot
0f8767e535 Merge changes from topic 'anno'
* changes:
  Support java annotation proccessors
  Add support for LOCAL_ERROR_PRONE_FLAGS
2017-04-11 18:26:16 +00:00
Colin Cross
cde14987ba Support java annotation proccessors
The codebase is growing more uses of annotation processors,
through a mixture of LOCAL_ADDITIONAL_DEPENDENCIES and
LOCAL_JACK_FLAGS.  Add LOCAL_ANNOTATION_PROCESSORS and handle
the rest in the build system.

For now we also need LOCAL_ANNOTATION_PROCESSOR_CLASSES to
work around bad behavior in grok (b/25860419).

Test: m -j java
Change-Id: I465b021e65d25ed3ea517333a82ec4ebd63fc038
2017-04-11 09:56:09 -07:00
Dan Willemsen
9d2b3280e8 Support split /system and /vendor modules from Soong
Soong modules may be split into both /system and /vendor variants.
Ensure that Make libraries link against the correct version based on
whether LOCAL_USE_VNDK is set.

Bug: 36426473
Bug: 36079834
Test: build-aosp_arm64.ninja files are the same before/after
Test: attempt building with BOARD_VNDK_VERSION:=current
Change-Id: I229bc290373743406275f3ca16081eae04c27987
2017-04-10 15:54:50 -07:00
Colin Cross
5e58793731 Add support for LOCAL_ERROR_PRONE_FLAGS
This will allow individual modules to enable error prone checks
as needed so that the change to treat an error prone check as a
compiler error can be done atomically with the changes to fix
the issues that check reveals.

Tested with the following steps, cleaning up the targets in
between to ensure that it was rebuilt everytime.

Set LOCAL_ERROR_PRONE_FLAGS := -Xep:ClassCanBeStatic:WARN
compiler error in junit-params-test target. Built
javac-check-junit-params-test with RUN_ERROR_PRONE=true to make
sure that compilation failed.

Built the javac-check-junit-params-test without RUN_ERROR_PRONE
set to make sure that the flag is not included unless explicitly
requested.

Built the junit-params-test as normal to make sure it still
worked properly.

Bug: 31507496
Test: See above
Change-Id: I88b5800dacd0e30dd9dcfa5f42e89d1428957365
Merged-In: I88b5800dacd0e30dd9dcfa5f42e89d1428957365
(cherry picked from commit 3ca9298d99)
2017-04-07 17:46:40 -07:00
Dan Willemsen
67eb8bb766 Merge "Add LLNDK support for the VNDK"
am: 2d6e79d268

Change-Id: I659186edcf49180ecd18709be901145a55e9021c
2017-04-07 21:31:27 +00:00
Dan Willemsen
2d6e79d268 Merge "Add LLNDK support for the VNDK" 2017-04-07 21:21:32 +00:00
Dan Willemsen
ffa3258f6c Add LLNDK support for the VNDK
Instead of using the NDK headers and libraries, add LL-NDK specific
headers and library stubs for VNDK users. This allows us to provide an
expanded liblog interface.

Test: aosp_arm; m -j
Test: Enable BOARD_VNDK_VERSION on aosp_arm; m -j
Change-Id: I0197f44c91218c73b9567a05320c91a2baaae39b
2017-04-07 21:21:24 +00:00
Tao Bao
c23d275d02 Merge "releasetools: Add validate_target_files.py."
am: 6cb177f15c

Change-Id: I43fcdc12e713a6e66dff624e1dd3d6d07ee86c99
2017-04-06 21:00:01 +00:00
Tao Bao
6cb177f15c Merge "releasetools: Add validate_target_files.py." 2017-04-06 20:50:09 +00:00
Colin Cross
50d2ffdfe3 Merge "Fix duplicate and dangling rules"
am: f9f8b21af3

Change-Id: I7da59735bf22dbf54cdadfb45e01e21693e4054b
2017-04-06 20:00:31 +00:00
Treehugger Robot
f9f8b21af3 Merge "Fix duplicate and dangling rules" 2017-04-06 19:49:45 +00:00
Colin Cross
96476c1d50 Fix duplicate and dangling rules
I6730e2d3ec38004874265b2a690442dec57b33f4 introduced duplicate rules
to build classes.jar for static java library prebuilts, and left rules
to copy $(built_dex_intermediates) to $(built_dex) for modules that
don't build dex files.

Move prebuilts LOCAL_BUILT_MODULE back to javalib.jar to match
non-prebuilt modules, and remove the manual building of javalib.jar.

Add a check around $(built_dex_intermediates) for static java libraries.

Bug: 36901093
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I291510b56162f0d35553e3c7ccd59b1382224d62
2017-04-06 10:23:04 -07:00
Colin Cross
a4435a5025 Merge "Rearrange java library outputs"
am: 7b7363fffb

Change-Id: Ia0f975785542973a052cd0b24ee9c1b756babfe6
2017-04-06 15:37:52 +00:00
Colin Cross
7b7363fffb Merge "Rearrange java library outputs" 2017-04-06 15:30:45 +00:00
Colin Cross
c40073c77f Merge "Move proguard before classes.jar"
am: 41d5cd7420

Change-Id: I65fe576155f9375d4f05f598b62032af1d3e6695
2017-04-06 02:44:23 +00:00
Treehugger Robot
41d5cd7420 Merge "Move proguard before classes.jar" 2017-04-06 02:39:13 +00:00
Colin Cross
941b682099 Rearrange java library outputs
Jack can silently handle using a java library as a static java
library by merging in the java library dex file.  This causes
problems when switching to javac, because dex doesn't support
dex merging with multidex enabled?

Make the output files consistent between java libraries and static
java libraries.  Java libraries will now produce:
classes-pre-proguard.jar: the classes before proguard processing
classes.jar: the final jar file containing classes before dexing
javalib.jar: a jar containing classes.dex

Static java libraries will eventually only produce
classes-pre-proguard.jar and classes.jar.  All inter-library
linking is done with classes.jar, so a java library can be
used as a static java library.

There are too many dependencies outside the build system that
expect javalib.jar to exist for static and host java libraries,
so for now continue to build a javalib.jar that is a copy of
classes.jar.

Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Test: m -j java
Bug: 36901093
Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
2017-04-05 18:04:37 -07:00
Chih-hung Hsieh
1124a1bd01 Merge "Encode special characters in email addresses."
am: c4a7ed3530

Change-Id: I5b22ee5588388433c82333993bd2ebb25dbd9d52
2017-04-06 00:46:45 +00:00
Colin Cross
950f1efbbc Move proguard before classes.jar
Downstream users of a library always link against javalib.jar, which
is either the dex jar for java libraries or a copy of
proguard.classes.jar for static java libraries.  In preparation for
making java libraries a superset of static java libraries, make
classes.jar always be the final class-containing jar for use
downstream, and always create a classes-pre-proguard.jar for
users that need a jar without shrinking or obfuscation.

Also rename the intermediates to be consitent: classes-<tool>.jar

Test: m -j ANDROID_COMPILE_WITH_JACK=false java
Change-Id: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92
Merged-In: I3df8b9a4edcd5db996f1fedc54c8a782d4f36a92
(cherry picked from commit 6fabefa88e)
2017-04-06 00:46:23 +00:00
Chih-hung Hsieh
c4a7ed3530 Merge "Encode special characters in email addresses." 2017-04-06 00:40:51 +00:00
Chih-Hung Hsieh
bee0dec6c4 Encode special characters in email addresses.
Now accept email addresses with '+' character.

Bug: 33166666
Test: checkowners.py -v -c `find . -name OWNERS`
Change-Id: I7792551e6be74e942906a75344233439d4bfeca3
2017-04-05 14:16:49 -07:00
Simran Basi
65850daeb0 Revert "Revert "device-tests: As a dependency to tests""
This reverts commit df086140a8.

CQ-DEPEND=CL:365575
Bug: 35386840
Test: None

Change-Id: I17dc00ed64e220c5ce532386da1a1bc15cbfc439
2017-04-05 20:51:01 +00:00
Simran Basi
8a431d9c7d Common testcase directories: Clean up duplicates
This CL addresses the problem that native tests build for multiple
architectures and also build for host.

First it restructures each testcase folder to the following layout:
<testcase>/<testcase>.config
<testcase>/<arch 1>/testcase
<testcase>/<arch 2>/testcase

Secondly it now uses the new soong-zip prefix capability to
separate out host and target testcases in the device-tests &
general-tests zip files.

Bug:36692141
Test: `make device-tests general-tests cts -j` &
      ensured all built successfully.

Change-Id: I4e8b084ee56fa8940914911649ff35507d87eb27
2017-04-05 13:38:20 -07:00
doheon1.lee
8250dc4837 Added make files for variable Nougat MR1
Nougat MR1 has different API LEVEL from previous releases,
PRODUCT_SHIPPING_API_LEVEL should be set to 25.

Change-Id: Ib3679bba4105dc99b96224c5f5554c1f0e4ab127
2017-04-05 19:45:50 +00:00
Tao Bao
afaa0a638b releasetools: Add validate_target_files.py.
Bug: 35408446
Test: validate_target_files.py on existing target_files zips.
Change-Id: I140ef86533eee5adb93c2546510fdd7e9ce4e81a
2017-04-05 09:04:13 -07:00
Dan Willemsen
1cc4bfaad5 Merge "Add LOCAL_EXPORT_CFLAGS for Soong"
am: a1c1e7d02f

Change-Id: I0b52a889346ca29c7679bbb29b1e89f08b7efc4d
2017-04-05 05:46:05 +00:00
Dan Willemsen
a1c1e7d02f Merge "Add LOCAL_EXPORT_CFLAGS for Soong" 2017-04-05 05:43:05 +00:00
Dan Willemsen
2a8a39398b Add LOCAL_EXPORT_CFLAGS for Soong
This lets Soong pass -isystem or -I as necessary (or potentially, even
other cflags in the future).

This is not available for Android.mk use, nor exposed directly to
Android.bp users.

Test: m -j
Merged-In: Id37d4692d5fbddce467bd777903b20169f44dd6e
Change-Id: Id37d4692d5fbddce467bd777903b20169f44dd6e
2017-04-05 03:36:00 +00:00
Dan Willemsen
376d29284a Merge "Exclude ndk stubs from notice file list"
am: b923eb60cd

Change-Id: I2243e2dd534b602d983a8233d1499e7063d10a05
2017-04-05 00:13:39 +00:00
Treehugger Robot
b923eb60cd Merge "Exclude ndk stubs from notice file list" 2017-04-05 00:09:01 +00:00
Dan Willemsen
2be559488d Exclude ndk stubs from notice file list
There are many references to ndk stub libraries in the third party
notices:

out/soong/ndk/platforms/android-10/arch-arm/usr/lib/libc.so
out/soong/ndk/platforms/android-10/arch-arm/usr/lib/liblog.so
...

These are just stub libraries, and aren't distributed on the device. The
real versions of these libraries will be distributed on the device, and
already have the license information.

So let Soong set LOCAL_NO_NOTICE_FILE to prevent these from appearing.

Bug: 36867708
Test: Diff aosp_arm's system/etc/NOTICE.html.gz file before/after
Change-Id: Ifa3693bde7d3b6b9dc7a83122f9cfa24997fac50
2017-04-04 14:59:55 -07:00
Jaekyun Seok
78a117d801 Merge "Use product-based inclusive rule for enforcing RRO"
am: 4f566f3f97

Change-Id: Iaa5ec37c9d6d0e9c2dfe9573b61465e127d60f8d
2017-04-04 04:40:08 +00:00
Treehugger Robot
4f566f3f97 Merge "Use product-based inclusive rule for enforcing RRO" 2017-04-04 04:34:36 +00:00
Jaekyun Seok
1b2242895e Use product-based inclusive rule for enforcing RRO
Board-based rule can cause unexpected regression because build-time overlays
are different among products. So each product should be tested with its own
product-based rule considering its build-time overlays before applying
enforcing RRO.

Additionally RRO conversion is mandatory only for overlays of which target is
included in AOSP system image and is critical for CTS/VTS tests with AOSP
system image. So inclusive rule is more suitable instead of exclusive rule
to avoid unexpected regression due to unnecessary RRO conversion.

Note that we still support conversion for all the overlays by specifying
PRODUCT_ENFORCE_RRO_TARGETS as "*".

Test: building succeeded and tested with auto-generated RROs.
Bug: 36231603
Change-Id: I8e1d701d4f78b818c89ef3e7638110105370c5bc
(cherry picked from commit 2a209997e8)
2017-04-04 11:31:24 +09:00
Alex Deymo
b20d1d7a74 Merge "Don't include the dev-key on IOT products."
am: 41febee0cc

Change-Id: I1825d82eac9b046c76d35bbb93bae31f86fd2be5
2017-04-04 00:49:40 +00:00
Treehugger Robot
41febee0cc Merge "Don't include the dev-key on IOT products." 2017-04-04 00:43:35 +00:00
Alex Deymo
cec578c916 Don't include the dev-key on IOT products.
This patch updates the logic to use the PRODUCT_IOT variable instead of
BRILLO.

Bug: 36702887
Test: `make`; Image doesn't have the dev key.
Change-Id: I1751e97d8cdfeba83c7e4720a017a5f4dcfd49da
2017-04-03 15:04:35 -07:00
Elliott Hughes
d83bb4193a Merge "fsconfig: Use defined macro for masking"
am: 35eaf52ee2

Change-Id: I291e16fba756e661dcd56722b957ce68bc055c9b
2017-04-03 21:28:10 +00:00
Elliott Hughes
35eaf52ee2 Merge "fsconfig: Use defined macro for masking" 2017-04-03 21:21:55 +00:00
Elliott Hughes
b7b29357ae Merge "Switch to a shell_and_utilities phony module."
am: cdcc4c52aa

Change-Id: Idb8a4ce418a64ac8691df9d1890d60f32102c1cc
2017-04-03 17:19:35 +00:00
Elliott Hughes
cdcc4c52aa Merge "Switch to a shell_and_utilities phony module." 2017-04-03 17:15:17 +00:00
Elliott Hughes
c86ea11fe9 Switch to a shell_and_utilities phony module.
(cherrypick of cb7d59687483c9532beecde60fe96053eda76948.)

Bug: N/A
Test: builds
Change-Id: I6416d9dded4cc225f57f0a521cf6114f39203ece
2017-04-03 17:13:58 +00:00