Commit graph

2642 commits

Author SHA1 Message Date
Dan Albert
79a9014c9b Merge "Require that NDK symbol files end with .map.txt."
am: 2a60959b65

Change-Id: I77115c6b7f76906dd2ac65c87b774c8cb3a15a81
2017-06-14 00:34:03 +00:00
Treehugger Robot
2a60959b65 Merge "Require that NDK symbol files end with .map.txt." 2017-06-14 00:21:45 +00:00
Jeff Gaston
41a88d181d Only check for ninja stuckness after it's been running for a bit
am: a6697e8b7f

Change-Id: I28d3b9d0f83aefbe8d7f9f2cb07a9c126276742b
2017-06-13 23:58:29 +00:00
Dan Albert
15be0c6a36 Require that NDK symbol files end with .map.txt.
We're making an NDK API Council +1 a requirment for changes to these
files, so we need to know that all symbol files will match a given
file pattern.

Test: Changed a symbol file to foo.txt, `make ndk` failed
Test: make ndk
Bug: http://b/35870541
Change-Id: I29690fb97746ad682e57845fea3f1114cfd77598
2017-06-13 15:14:56 -07:00
Jeff Gaston
a6697e8b7f Only check for ninja stuckness after it's been running for a bit
Bug: 62580037
Test: rm -rf out && m -j showcommands | grep "ninja may be stuck" || echo ok

Change-Id: I8ff1bd216b5f8349ce9e06e5465a9f8d0663f8c0
2017-06-13 14:15:02 -07:00
Jeff Gaston
be95116215 Make absolute OUT_DIR work with sbox
am: 193f2fb092

Change-Id: I8df526750666e92e7c863a79e4ed8fad7ff64fc1
2017-06-13 18:02:34 +00:00
Jeff Gaston
193f2fb092 Make absolute OUT_DIR work with sbox
Test: make OUT_DIR=/tmp/abspath
Test: make OUT_DIR=relative-out
Bug: 35562758

Change-Id: I688d5f6117b194440c5d01c1040033b5671187c2
2017-06-12 16:36:17 -07:00
Nan Zhang
78a4dd0173 Fix the issue that /tmp/soong_python_test* isn't being removed.
am: aac67d38b2

Change-Id: I348801f343318e3a7e135087282db75ae4f88665
2017-06-12 19:56:53 +00:00
Nan Zhang
aac67d38b2 Fix the issue that /tmp/soong_python_test* isn't being removed.
Bug: 62499851
Test: go test
Change-Id: I84bd66cd1410dd9fc6add3ba5626d8ec4fe702d7
2017-06-12 10:49:42 -07:00
Jeff Gaston
195360b9c6 Easier debugging of sbox
am: f49082afab

Change-Id: I0a9dcc748966a7db457a108868c1d13046de0d0a
2017-06-09 22:17:59 +00:00
Jeff Gaston
fe4bf0f9a7 Have Soong try to enforce that genrules declare all their outputs.
am: efc1b412f1

Change-Id: I1130224e412109810ad6b10127aeebf5797431d6
2017-06-09 22:17:56 +00:00
Jeff Gaston
f49082afab Easier debugging of sbox
Cleanup of some failure messages
Also, this leaves the temp directory untouched if a declared output was not created

Bug: 35562758
Test: make

Change-Id: I8ef1315af80eb327752501f12a331dbdf52ba3e9
2017-06-09 17:57:33 +00:00
Jeff Gaston
efc1b412f1 Have Soong try to enforce that genrules declare all their outputs.
This causes Soong to put the outputs of each genrule into a temporary
location and copy the declared outputs back to the output directory.
This gets the process closer to having an actual sandbox.

Bug: 35562758
Test: make

Change-Id: I8048fbf1a3899a86fb99d71b60669b6633b07b3e
2017-06-09 17:57:18 +00:00
Dan Willemsen
97e8052c6d Merge "Add pom2mk, a maven repo -> Android.mk tool"
am: 6b78fa8c01

Change-Id: I7c9da93aa590efef002c55011d66d45aaa03c200
2017-06-08 18:53:35 +00:00
Dan Willemsen
6b78fa8c01 Merge "Add pom2mk, a maven repo -> Android.mk tool" 2017-06-08 18:41:49 +00:00
Dan Willemsen
2902fa7148 Add pom2mk, a maven repo -> Android.mk tool
This is still fairly simplistic, but good enough to test some build
system changes.

Bug: 33381544
Test: run, inspect output
Change-Id: Ia5c19570493116dca01cb65605cdf20becf8c1d0
2017-06-07 23:25:16 -07:00
Vishwath Mohan
9132b17c47 Merge "Fix install path for sanitized native tests. (Soong)"
am: d20ac72951

Change-Id: I3a9594efb1637624bf088d92b3d9731436c0c124
2017-06-08 02:59:53 +00:00
Vishwath Mohan
d20ac72951 Merge "Fix install path for sanitized native tests. (Soong)" 2017-06-08 02:57:11 +00:00
Evgenii Stepanov
0fabe66321 Don't add -lrt on Darwin for sanitized targets.
am: c6482d69c2

Change-Id: Ifdb10085e8ecb3e9fda394e59f46fca469826ab6
2017-06-08 01:55:20 +00:00
Evgenii Stepanov
c6482d69c2 Don't add -lrt on Darwin for sanitized targets.
Bug: 34719251

Change-Id: Iff81c4d891a2341a8152e5603391b55b0222ebd7
2017-06-07 16:19:17 -07:00
Jeff Gaston
8bf594088b Merge "Run 'pstree' if ninja_log hasn't updated recently"
am: 3f050c8ea8

Change-Id: If0d6e0d52b869982785153102f71fa88d5743743
2017-06-07 19:42:47 +00:00
Jeff Gaston
3f050c8ea8 Merge "Run 'pstree' if ninja_log hasn't updated recently" 2017-06-07 19:37:46 +00:00
Vishwath Mohan
87f3b24418 Fix install path for sanitized native tests. (Soong)
This CL fixes a bug with how Soong builds the install path for native
tests. Tests are installed in /data/nativetest* by default, but the
logic was wrongly redirecting sanitized versions to
/data/asan/system/nativetest*. With this fix, they are correctly
redirected to /data/asan/data/nativetest* instead.

Bug: 37942061
Test: lunch marlin_asan-userdebug && \
        SANITIZE_TARGET="address" m -j70  \
        # nativetests are generated in /data/asan/data/nativetest*

Change-Id: I0c132af5d443151c44219d231770049fddf79bbe
2017-06-07 12:31:57 -07:00
Evgenii Stepanov
3da25135a5 Fix -fsanitize=integer not passed for soong builds.
am: 76cee23144

Change-Id: I5208eb8f96cbed2903ade1228871b72a1dac6d9e
2017-06-07 19:12:03 +00:00
Evgenii Stepanov
76cee23144 Fix -fsanitize=integer not passed for soong builds.
Also filter out -Wl,--no-undefined for all host sanitizers, not just ASan.
UBSan on host defaults to no-trap (i.e. diagnostic mode), and that requires
the runtime library and runs into the same problem with undefined symbols as ASan.

Bug: 34719251
Test: Misc_undefined: ["integer"] on a soong target
Change-Id: I1fb4781f663a11f5f427d50c0bf9beb8e181cd5e
Merged-In: I1fb4781f663a11f5f427d50c0bf9beb8e181cd5e
(cherry picked from commit fe9bc1dccb)
2017-06-07 11:01:02 -07:00
Jeff Gaston
809cc6f58a Run 'pstree' if ninja_log hasn't updated recently
This doesn't catch all the possible causes of timeouts,
(like if Ninja is only partially stuck or if Kati is stuck)
but it should clarify some causes of stuckness

Bug: 62065855
Test: m -j showcommands NINJA_HEARTBEAT_INTERVAL=500ms
Change-Id: I73a792ae91873b19d7b336166a2d47f37c549906
2017-06-06 16:33:51 -07:00
Yi Kong
d24ed23833 Switch to clang-4053586
am: dadff1b8d2

Change-Id: I6b5f3bf0311be87c4408c96b17fbcb829612b2f3
2017-06-06 21:17:55 +00:00
Leo Li
3348b2d79c Export clang default settings.
am: e748f5d912

Change-Id: Ie916a67b5989b46cd56e48185624d844beea631a
2017-06-04 19:04:16 +00:00
Yi Kong
dadff1b8d2 Switch to clang-4053586
Bug: 37423073
Test: Build on multiple devices
Change-Id: I4d1b328129faac28e3b38c3c7640f8c91a3f8ff2
2017-06-04 12:02:08 -07:00
Leo Li
e748f5d912 Export clang default settings.
Test: Refactor no tests.

Change-Id: Ib920962e8a42ef67c4eb1517e9274ff1120d15a0
(cherry picked from commit 8756b37432)
2017-06-03 22:44:18 +00:00
Dan Willemsen
b7f88de4bb Have installclean remove android-info.txt again
am: a18660d366

Change-Id: I8f7a6c6e3318ae255f9cdce7bcc8a04bb8723cc5
2017-06-01 23:04:05 +00:00
Dan Willemsen
a18660d366 Have installclean remove android-info.txt again
I removed *.txt from the installclean list yesterday, but it turns out
that android-info.txt being removed was the only thing triggering
system.prop to be rebuilt on the incremental build servers. So continue
android-info.txt so that the version information in system.prop is
correct.

I'll follow this up with a more complicated change to make the
system.prop generation depend on the build number/versions more
directly, but that's a more complicated change since we need to change
how the build number file is written.

Bug: 62252890
Test: m ...intermediates/system.prop; m installclean; m ...intermediates/system.prop
Change-Id: I25dd8ddd99f7b2c927a8cbfb7f1aca1dd3e82a82
2017-06-01 22:49:47 +00:00
Dan Willemsen
70bb9f0eeb Stop installcleaning $PRODUCT_OUT/*.{ini,txt,xlb}
am: e427a40356

Change-Id: I6fb99f80f1206b68e75632f2c86b074e82fac803
2017-06-01 07:47:40 +00:00
Dan Willemsen
e427a40356 Stop installcleaning $PRODUCT_OUT/*.{ini,txt,xlb}
For *.ini/*.txt files we should be recreating them as the instructions
change, so we shouldn't need to remove them. The biggest reason to
remove them is that the auto-installclean was removing
$PRODUCT_OUT/build_fingerprint.txt just after Kati wrote it out, causing
the fingerprint to be blank on builds where the auto installclean code
ran.

There's no reference to xlb in our tree, and it's been around since the
beginning of git history, so remove it.

Bug: 62224537
Test: lunch aosp_arm-eng; m nothing;
      lunch aosp_arm-userdebug; m -j nothing;
      check out/target/product/generic/build_fingerprint.txt
Change-Id: Id391af5c7d95ea78e4e68fae294d8295fccb1964
2017-05-31 17:26:34 -07:00
Chris Larsen
e75269a157 Merge "MIPS: Lower LibartImgDeviceBaseAddress() to fix ART tests."
am: d55aa7bdad

Change-Id: I6906a538c5cdf13ab61139d2fda55ec192b7ca5c
2017-05-31 11:38:21 +00:00
Treehugger Robot
d55aa7bdad Merge "MIPS: Lower LibartImgDeviceBaseAddress() to fix ART tests." 2017-05-31 11:32:31 +00:00
Chris Larsen
ae7f3e26ec MIPS: Lower LibartImgDeviceBaseAddress() to fix ART tests.
Some of ART tests fail to mmap memory unless
LibartImgDeviceBaseAddress() is further lowered.

Test: booted MIPS32R2 in QEMU
Test: booted MIPS64 (with 2nd arch MIPS32R6) in QEMU
Test: test-art-target-gtest
Test: testrunner.py --target --optimizing
Test: repeat all of the above in configurations
      ART_READ_BARRIER_TYPE=TABLELOOKUP,
      ART_USE_READ_BARRIER=false
Test: repeat the above tests on CI20

Change-Id: I48cd9d8074e07073cc6abb2153660e00017b9e6b
2017-05-30 16:38:42 -07:00
Dan Willemsen
38220c5554 Merge "Support Make rewriting APP-*"
am: 977fd8f1fa

Change-Id: If48e81cd099868d856f0b67820f7571c8fe4854a
2017-05-26 19:56:52 +00:00
Dan Willemsen
977fd8f1fa Merge "Support Make rewriting APP-*" 2017-05-26 19:51:56 +00:00
Colin Cross
8a328382bf Merge "Add pdk product variable"
am: e5598169b3

Change-Id: I1248463d9d500d36bc327ca75cffe4a44790d7b1
2017-05-26 19:39:57 +00:00
Colin Cross
e5598169b3 Merge "Add pdk product variable" 2017-05-26 19:34:32 +00:00
Elliott Hughes
b5ed0ba503 Merge "Add bionic's scsi headers to the include path."
am: 5800668001

Change-Id: Ib20a70dca7e223a5752ff5f0f486366be56e0728
2017-05-26 18:08:24 +00:00
Elliott Hughes
5800668001 Merge "Add bionic's scsi headers to the include path." 2017-05-26 18:04:28 +00:00
Tobias Thierer
d4174a1f76 Merge "Allow version 9 toolchains for EXPERIMENTAL_USE_OPENJDK9"
am: 9847add454

Change-Id: Ia65d378ca7355b0fbbe29daf889a005f5dd0cb80
2017-05-26 12:14:04 +00:00
Tobias Thierer
9847add454 Merge "Allow version 9 toolchains for EXPERIMENTAL_USE_OPENJDK9" 2017-05-26 12:08:38 +00:00
Tobias Thierer
849bb6bf99 Allow version 9 toolchains for EXPERIMENTAL_USE_OPENJDK9
By default, the Android build enforces an OpenJDK 8 toolchain,
whose name contains the strings "openjdk" and "1.8".

After this CL, the check can be changed to enforce a toolchain
name starting with "9" and without the need for "openjdk" having
to occur in the name.

This experimental new check can be enabled by running:
  export EXPERIMENTAL_USE_OPENJDK9=true
To switch back to the standard check, run:
  unset EXPERIMENTAL_USE_OPENJDK9

Test: make ANDROID_COMPILE_WITH_JACK=false checkbuild tests \
      && make checkbuild tests
      (with OpenJDK 8u45 toolchain on the PATH)
Test: make EXPERIMENTAL_USE_OPENJDK9=true \
      ANDROID_COMPILE_WITH_JACK=false checkbuild
      (with jdk 9-ea+170 toolchain on the PATH)
Bug: 38177295

Change-Id: I75de3e23fe0b7f41eb6dd3f55dadd3fa3c3383bd
2017-05-26 12:45:25 +01:00
Dan Willemsen
04a16c7dcf Support Make rewriting APP-*
Test: ALLOW_MISSING_DEPENDENCIES=true m -j APP-Calculator
Change-Id: If5a0b60a0dbc615b6f47ea222616f8d34950ba0c
2017-05-25 22:18:57 -07:00
Jeff Gaston
2b78696f1c Merge "Revert "Initial implementation of bpfix""
am: 99f64d439c

Change-Id: Ib9433fc757174a1bcf4452990bf471e7f238e51e
2017-05-26 00:41:44 +00:00
Jeff Gaston
f60e71cf22 Merge "Revert "Run bpfix at the end of androidmk""
am: ee765dc4ab

Change-Id: I40536af1a4a98ee26058ce2cac3b710c910a9010
2017-05-26 00:41:32 +00:00
Jeff Gaston
99f64d439c Merge "Revert "Initial implementation of bpfix"" 2017-05-26 00:33:02 +00:00