Commit graph

8513 commits

Author SHA1 Message Date
Nan Zhang
aee8fb0379 Add no_standard_libs property to droidstubs
am: 5994b620f2

Change-Id: Ia302462c2bf348a4fb4ec81c72ac0b65df3cd800
2018-09-25 10:18:36 -07:00
Nan Zhang
5994b620f2 Add no_standard_libs property to droidstubs
mainline-modules need this support to strip default libs.

Test: N/A
Bug: b/78245848
Change-Id: I8605019a55dd8f724c863ddaa705b72f461a7cb2
2018-09-25 17:02:10 +00:00
Richard Fung
82b39d59df Merge "Add support for cortex-a72"
am: 3013361546

Change-Id: I1add4a9a88d4a840d9ab699f3e8d53780f849441
2018-09-25 08:35:18 -07:00
Richard Fung
3013361546 Merge "Add support for cortex-a72" 2018-09-25 15:27:38 +00:00
Pete Gillin
a2e71873df Add droidstubs support for merging show/hide annotations.
am: 77167904e1

Change-Id: I68e35a2d9d8bf4ca2fc2155af585cdee80a16cda
2018-09-25 06:01:24 -07:00
Pete Gillin
77167904e1 Add droidstubs support for merging show/hide annotations.
This works like the existing annotation merging support, but uses a
different flag, because the merging needs to happen earlier in
metalava (see the other change in this topic).

Bug: 115746226
Test: `make api-stubs-docs`
Test: `make core-platform-api-stubs` with local modifications to trigger this path
Change-Id: I30d6d7993e06b105fb3e9fcefde39c1bf3da998a
2018-09-25 12:37:38 +01:00
Richard Fung
eb37ed3832 Add support for cortex-a72
Bug: 113346253
Test: lunch cheets_arm64-eng; m
Change-Id: I02dd1cfe75f97767eac7424d472ff643987c276b
2018-09-24 16:33:45 -07:00
Nan Zhang
f952b286ec Merge "Add comment for naming jdiffdocZip in droiddoc.go"
am: 2da4ea0b6b

Change-Id: Ie5713a88a83b41719d851607834680e272d675d7
2018-09-24 14:43:52 -07:00
Treehugger Robot
2da4ea0b6b Merge "Add comment for naming jdiffdocZip in droiddoc.go" 2018-09-24 21:31:41 +00:00
Nan Zhang
86b0620dc7 Add comment for naming jdiffdocZip in droiddoc.go
Add comment to provide some cautions in case of we make some changes on
the jdiffdocZip name in the future.

Test: N/A
Bug: b/116221385
Change-Id: I3b612d50465f7feb87bc26ef81e692bf72d6f98f
2018-09-24 12:09:24 -07:00
Chih-Hung Hsieh
0a4427da81 Use WITH_TIDY_FLAGS env variable.
am: 9e5d8a60e2

Change-Id: I42b0ba1ee10ab4a3290b355c40009081ed101376
2018-09-21 17:40:53 -07:00
Chih-Hung Hsieh
9e5d8a60e2 Use WITH_TIDY_FLAGS env variable.
This variable is a space separated string of clang-tidy flags to be passed
to clang-tidy before any other system required extra flags.
Note that when this flag or local tidy_flags is defined,
the default -header-filter flag is suppressed.

Test: make with WITH_TIDY=1 WITH_TIDY_FLAGS="-extra-arg=-DABCD1=1 -extra-arg=-DABCD2=2"
Bug: 32668284
Change-Id: If7bd31c65404ef7fe6c3499d51f0f209a704efd9
2018-09-21 15:19:24 -07:00
Chih-Hung Hsieh
5e669eff0a Use DEFAULT_TIDY_HEADER_DIRS env variable.
am: 60bd4bf079

Change-Id: I4c34db5d306beb15cf8160aa905c06b8459ea8f6
2018-09-21 12:26:07 -07:00
Chih-Hung Hsieh
60bd4bf079 Use DEFAULT_TIDY_HEADER_DIRS env variable.
This variable is a regular expression to be passed as
additional patterns to the -header-filter flag for clang-tidy.
For example, when make with WITH_TIDY=1 DEFAULT_TIDY_HEADER_DIRS="d1/d2|mydir/*"
for a project in external/xyz, clang-tidy will be called with additional flag
  -header-filter=\"(external/xyz|d1/d2|mydir/*)\"

Test: make with WITH_TIDY=1 DEFAULT_TIDY_HEADER_DIRS="d1/d2|mydir/*"
Bug: 32668284
Change-Id: I6051f4f80bc6dbab882bd81435ccbc772772ac63
2018-09-21 10:34:25 -07:00
Colin Cross
1effca05d6 Merge "Hide warning on static executables in strip.sh"
am: 21e2a790ca

Change-Id: I6537a9481ae4ce0148eee1fafadd0bad2942b33a
2018-09-20 22:41:07 -07:00
Treehugger Robot
21e2a790ca Merge "Hide warning on static executables in strip.sh" 2018-09-20 03:59:09 +00:00
Colin Cross
fd04d39db2 Merge "soong_zip: add support for -j to junk paths"
am: c4fa0822cd

Change-Id: Ic9e7f602ed2651b67ced3604d20934e34281936e
2018-09-19 20:02:10 -07:00
Colin Cross
c4fa0822cd Merge "soong_zip: add support for -j to junk paths" 2018-09-20 02:45:14 +00:00
Anton Hansson
67f5fb73f8 Merge "Sanity check the tree before building."
am: cba8587bd7

Change-Id: Ifea5e6a26dbe5d3451a5281dd229ab6296659357
2018-09-19 19:18:53 -07:00
Anton Hansson
cba8587bd7 Merge "Sanity check the tree before building." 2018-09-20 02:01:13 +00:00
Colin Cross
8e877af5f4 Hide warning on static executables in strip.sh
Stripping static executables prints a warning:
bash: prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-nm: No such file or directory

The message is harmless, just hide it.

Also turn on pipefail so that the script will exit if the command
returns an error.

Bug: 24409581
Test: m checkbuild
Change-Id: I9647c55c3509e4573e6d4f2f6d88119bdf31e9fb
2018-09-19 23:23:51 +00:00
Colin Cross
b7c6911dd1 soong_zip: add support for -j to junk paths
When -j is specified ignore the path to the source file and just
zip it with its filename.  -j overrides -C, and -C overrides -j,
so -j -f path1 -C dir -f path2 will junk the path for path1, but
treat path2 as relative to dir.

Remove the filepath.Clean for the FileArgs, it would convert ""
to "." sometimes, and everything gets cleaned in zip already for
the non-command-line use cases.

Test: m checkbuild
Change-Id: I7d90572c622ee0c6f35967ff31d067b5312c72eb
2018-09-19 15:40:09 -07:00
Anton Hansson
ecf0f10d3d Sanity check the tree before building.
Check for the presence of Android.mk or CleanSpec.mk, which
are somewhat common problems.

Bug: 113147143
Test: m (with and without files present)
Change-Id: I31cf60c325e7f6c6fce7aec54712c1cb802055c2
2018-09-19 22:48:48 +01:00
Nan Zhang
b5a8b4541e Merge "Fix race condition for jdiff/apicheck"
am: 2b2b6a72d3

Change-Id: I4798a5df45f6b10cce0bf886fb506b430b8a6020
2018-09-19 11:54:50 -07:00
Nan Zhang
2b2b6a72d3 Merge "Fix race condition for jdiff/apicheck" 2018-09-19 18:28:20 +00:00
Nan Zhang
23a1ba687d Fix race condition for jdiff/apicheck
Some build breakages happening on git_master/docs because jdiff rule and
apicheck rule may start in the same time, and jdiff may delete the same
srcjars and out dirs when apicheck trying to read which can cause
apicheck to be failed.

So change the dir names used by jdiff to not mix with dirs used by
apicheck.

Test: m -j docs
Bug: b/114368000
Change-Id: I90a53e0ef5f1ff947db7eb8cc73744919a9b93cb
2018-09-19 11:19:39 -07:00
Tobias Thierer
cf7f66ad73 Merge "Allow patch_module attribute in target: { android: { ... } } block."
am: f8202802f6

Change-Id: I8cdb6d7ce8635116e13bcdad33031daf31f8313f
2018-09-19 11:06:24 -07:00
Treehugger Robot
f8202802f6 Merge "Allow patch_module attribute in target: { android: { ... } } block." 2018-09-19 17:56:29 +00:00
Dan Willemsen
d39087a209 Merge "*_OUT_INTERMEDIATE_LIBRARIES has been removed from Make"
am: 105de3443d

Change-Id: I85fcd8da713f6e57672493bb8fdef99056dfc53c
2018-09-19 10:37:44 -07:00
Dan Willemsen
105de3443d Merge "*_OUT_INTERMEDIATE_LIBRARIES has been removed from Make" 2018-09-19 17:19:37 +00:00
Nan Zhang
9969eaf308 [automerger skipped] Export Api-versions.xml generated by Soong
am: d23ac69a35  -s ours

Change-Id: I2bb6f702f99b312e3fd0487cb326d4e685729a5d
2018-09-19 08:45:33 -07:00
Tobias Thierer
dda713d6fc Allow patch_module attribute in target: { android: { ... } } block.
patch_module is currently only used for non-host targets, although
there's a slim chance that there might be use cases on host in
future.

Currently, the only use case is patch_module: "java.base" in
device targets. To avoid erroneously carrying the patch_module
attribute over into the host version of the target, this CL
lets them place it into the target: { android: { ... } } block.

Test: Treehugger
Test: EXPERIMENTAL_USE_OPENJDK9=true make android-icu4j-tests
Bug: 115604102

Change-Id: If025d503d9c5681748a502a1d7433e8dbec3cac1
2018-09-19 16:31:30 +01:00
Nan Zhang
d23ac69a35 Export Api-versions.xml generated by Soong
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I951ac6294b1cdab3904009897efb8139c7c4f1a2
Merged-In: I951ac6294b1cdab3904009897efb8139c7c4f1a2
2018-09-19 05:39:46 +00:00
Nan Zhang
9ca4274e1c Merge "Add jdiff support for Soong"
am: fd20eade07

Change-Id: I39d6fb389814b545b86dd2994092c2cddc1a34d1
2018-09-18 22:05:28 -07:00
Treehugger Robot
fd20eade07 Merge "Add jdiff support for Soong" 2018-09-19 03:02:19 +00:00
Colin Cross
9078d2c871 Merge "soong_zip: move the -j flag to -parallel"
am: dbfc481996

Change-Id: I78f0b910011a6b7ac5f0ed2c4e0d8e9f8b80a7ba
2018-09-18 18:56:59 -07:00
Colin Cross
dbfc481996 Merge "soong_zip: move the -j flag to -parallel" 2018-09-19 01:42:24 +00:00
TreeHugger Robot
2f175c0b3d Merge "Export Api-versions.xml generated by Soong" into stage-aosp-master 2018-09-19 00:44:11 +00:00
Colin Cross
df3f4c81f3 soong_zip: move the -j flag to -parallel
The -j flag is going to be repurposed to match --junk-paths in zip.

Test: m checkbuild
Change-Id: Id3809d6e5e3da375531269f2372eefc565091cc2
2018-09-18 16:31:09 -07:00
Brandon Lee
f8428af19e Collect modules' info to create IDE project file.
am: 5d45c6f6f8

Change-Id: I8b01e5ceade01e75392c0b9191b528d0b5991450
2018-09-18 14:53:44 -07:00
Nan Zhang
71bbe63526 Add jdiff support for Soong
Test: api-stubs-docs-diff
Bug: b/78245848
Change-Id: I069f6f8b1f9aa74ae1425cd5b792643d05b26820
2018-09-18 14:07:30 -07:00
Nan Zhang
2683dace66 Export Api-versions.xml generated by Soong
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I951ac6294b1cdab3904009897efb8139c7c4f1a2
2018-09-18 12:46:25 -07:00
Brandon Lee
5d45c6f6f8 Collect modules' info to create IDE project file.
- Register a singleton and implement GenerateBuildActions func in java/jdeps.go.
- Declare a interface and a struct to collect info in android/module.go.
- Implement IDEInfo for Library & Import module in java/jdeps.go.
- Implement IDEInfo for Genrule module in genrule/genrule.go.
- Implement IDEInfo for fileGroup module in android/filegroup.go.
- Test codes for jdeps.go in java/jdeps_test.go.

Bug: 111044346

Test: export SOONG_COLLECT_JAVA_DEPS=1;mmm packages/apps/Settings
      out/soong/module_bp_java_deps.json will be generated

Change-Id: If61da77b4d7614c2c5da438b6af4c725ceccc5c3
2018-09-18 17:44:10 +00:00
Colin Cross
69b9a2125a Merge "Allow instrumenting android_test modules."
am: cfbea98a57

Change-Id: I441e03e1853d46118e9c1974525e838c8b635dca
2018-09-18 10:42:36 -07:00
Colin Cross
cfbea98a57 Merge "Allow instrumenting android_test modules." 2018-09-18 17:22:22 +00:00
Steven Moreland
3ebb53f557 Merge "Add libbinder_ndk to the NDK."
am: f7873ecf6d

Change-Id: Ia97d75689abcef276dfa45bc9caebb022c35fa55
2018-09-18 08:31:05 -07:00
Steven Moreland
f7873ecf6d Merge "Add libbinder_ndk to the NDK." 2018-09-18 15:19:44 +00:00
Mathieu Chartier
a4a51a2d6c Merge "Revert "Change LibartImgDeviceBaseAddress to 0x60000000""
am: ab033dc684

Change-Id: I637acebf2f39aae3275dd065109e98638f57a455
2018-09-18 00:28:43 -07:00
Mathieu Chartier
ab033dc684 Merge "Revert "Change LibartImgDeviceBaseAddress to 0x60000000"" 2018-09-18 07:11:33 +00:00
Mathieu Chartier
d42f19cd7a Revert "Change LibartImgDeviceBaseAddress to 0x60000000"
This reverts commit 0c7bb7f31b.

Reason for revert: Some tests failing

Change-Id: I354ab0055aa8a7dea688422871d13aa78fa0018d

Exempt-From-Owner-Approval: bypass
Test: make
Bug: 112670831
Bug: 115828232
2018-09-18 07:10:36 +00:00