Commit Graph

27106 Commits

Author SHA1 Message Date
Colin Cross 5cde746042 Make jack_check_timestamp depend on setup-jack-server
Some builds were failing with:
[  3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'

While jack-admin was running concurrently:
[  3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar  2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher

(cherry picked from commit febe2bcc21)

Change-Id: I406afc87b4f7dda49406c4e1674430d223914e8d
2016-04-20 09:36:45 +02:00
Duane Sand 181e93f19c Merge "Enable asan/ubsan for mips"
am: a58cefb

* commit 'a58cefb6834fefe411c0b14782d2e5ad8c148389':
  Enable asan/ubsan for mips

Change-Id: I2af83d34fa183a2eecbe4f16e4ff5579d8d8ca3c
2016-04-20 04:50:58 +00:00
Stephen Hines a58cefb683 Merge "Enable asan/ubsan for mips" 2016-04-20 04:44:39 +00:00
Ying Wang 07ad8765ab Merge "Don\'t reset LOCAL_*MODULE_STEM."
am: e77e5e7

* commit 'e77e5e7b5ba8991323cd1c421e9076cbe46b2bb3':
  Don't reset LOCAL_*MODULE_STEM.

Change-Id: I642dd9ec7a9ba3ae9a4a5f0b3c889fbf22c48353
2016-04-19 20:58:58 +00:00
Ying Wang e77e5e7b5b Merge "Don't reset LOCAL_*MODULE_STEM." 2016-04-19 20:50:38 +00:00
Ying Wang c160c3f21a Don't reset LOCAL_*MODULE_STEM.
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.

Bug: 27775991
Change-Id: I36d1ff3d177818677fb38bdb3d340dd2ff34c404
2016-04-19 12:20:47 -07:00
Nikola Veljkovic b077e80d04 Merge "Make sure platform libraries are built, regardless of webview.apk"
am: da7fef6

* commit 'da7fef62aa60da65a9f183cf82c14b6aa7694aff':
  Make sure platform libraries are built, regardless of webview.apk

Change-Id: I9cd12ab64852adc6761fd975b8606f08b78bfe1d
2016-04-19 17:15:19 +00:00
Dimitry Ivanov da7fef62aa Merge "Make sure platform libraries are built, regardless of webview.apk" 2016-04-19 17:07:20 +00:00
Nikola Veljkovic 8f1ac7c9d6 Make sure platform libraries are built, regardless of webview.apk
Prebuilt WebView is missing for mips64 architecture. Allow device
to boot without it, by making sure platform support libraries are
part of the system image.

WebView APK can then be installed separately.

Change-Id: Iabbb5e6a4778b7542d24bb4f789a7be96232e50c
2016-04-19 14:25:50 +00:00
Shinichiro Hamaji 3deb87d5fd Add input dependencies to .img targets
They should have build/tools/releasetools/*.py as their
prerequisites.

Bug: 27954979
Change-Id: I51595fc91caaad38be3e47befb5df7ac2683bf14
2016-04-19 18:41:27 +09:00
Neil Fuller ca9d53f883 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac"
am: 8c5698d

* commit '8c5698d220d4eb6bbba965c070d2fb792de6f3c1':
  Add core-lambda-stubs to default classpath for target libs compiling using javac

Change-Id: I8b6557aee0c120ea3c63bc0948c1109ca1b9a9e1
2016-04-19 08:18:31 +00:00
Neil Fuller 8c5698d220 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" 2016-04-19 08:13:23 +00:00
Shinichiro Hamaji d50001e74a Add normalize_path.py to prerequisites
Bug: 27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976
2016-04-19 16:22:27 +09:00
Yabin Cui 0ad593683e Merge "Revert "Use strip mode mini-debug-info by default.""
am: b34f69f

* commit 'b34f69f8499fe699edaca8715bed13b884cb9669':
  Revert "Use strip mode mini-debug-info by default."

Change-Id: Ie234fc5a11933a3364c34981f110f25f6f0842b8
2016-04-19 03:48:49 +00:00
Yabin Cui b34f69f849 Merge "Revert "Use strip mode mini-debug-info by default."" 2016-04-19 03:42:04 +00:00
Yabin Cui 3aa7df592b Revert "Use strip mode mini-debug-info by default."
This reverts commit 0e131e7e2c.

breaks in aosp_mips-eng

Change-Id: I468b0a47c878ffde9afc78442e8d4f0dabf7eb6e
2016-04-19 03:38:34 +00:00
Yabin Cui ab721f0a5f Merge "Use strip mode mini-debug-info by default."
am: c7eab6d

* commit 'c7eab6db2743abd98c6a5123c4f8764463547bd6':
  Use strip mode mini-debug-info by default.

Change-Id: Ibc7d3304a52b9dcf5573506b6ad5df35ec4ef167
2016-04-19 02:57:41 +00:00
Yabin Cui c7eab6db27 Merge "Use strip mode mini-debug-info by default." 2016-04-19 02:52:21 +00:00
Nick Kralevich ef77794259 Merge "Move sysfs_writable to emulator specific policy"
am: 821e3fd

* commit '821e3fd8184dca5c9f42ef7c923ddb772fe3d5c6':
  Move sysfs_writable to emulator specific policy

Change-Id: I54e4d7dd9c5aecb1e76d8c502a1e8d66dcbaf905
2016-04-18 23:22:39 +00:00
Treehugger Robot 821e3fd818 Merge "Move sysfs_writable to emulator specific policy" 2016-04-18 23:14:50 +00:00
Nick Kralevich 4c4c893447 Merge "Address emulator specific SELinux denials"
am: 35b0d00

* commit '35b0d00125d4ad9e69b8fc6c1264afd20a1d5028':
  Address emulator specific SELinux denials

Change-Id: I8efb0064f532e34a9fee35665a0185e14ed242e0
2016-04-18 22:22:40 +00:00
Nick Kralevich db411cf903 Move sysfs_writable to emulator specific policy
This type is never used in core policy, only by emulators.
Move the definition of this type to where it's used.

Bug: 28221393
Change-Id: I38dbc12dbe9813f323d4bcd5f07679db57b2fd4a
2016-04-18 15:18:09 -07:00
Nick Kralevich 35b0d00125 Merge "Address emulator specific SELinux denials" 2016-04-18 22:17:16 +00:00
Nick Kralevich 1eb14d0d61 Address emulator specific SELinux denials
(cherrypicked from commit 841f6d870d)

Fix the following denials:

  avc: denied { search } for pid=222 comm="system_server"
  name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
  scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
  tclass=file permissive=1

  avc: denied { read } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { open } for pid=222 comm="system_server"
  name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
  scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
  tclass=file permissive=1

  avc: denied { getattr } for pid=222 comm="system_server"
  path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
  ino=1430 scontext=u:r:system_server:s0
  tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1

  avc: denied { search } for pid=424 comm="putmethod.latin"
  name="qemu_trace" dev="sysfs" ino=45
  scontext=u:r:untrusted_app:s0:c512,c768
  tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1

Bug: 28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0
2016-04-18 14:57:24 -07:00
William Roberts 8e20023bb9 Merge "fs_config: include both oem ranges"
am: 27e0d48

* commit '27e0d48f0be2242655d005d0d37c705d4a8ccf33':
  fs_config: include both oem ranges

Change-Id: I3a5c12539e58810e09e2f41277f95c191e1daeaf
2016-04-18 20:50:33 +00:00
Treehugger Robot 27e0d48f0b Merge "fs_config: include both oem ranges" 2016-04-18 20:35:27 +00:00
Dan Austin d7c070f4a0 Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
am: 7984620

* commit '798462046192ede9e723672016da5f7aa17fc988':
  Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.

Change-Id: Ie67479e1157d97f5b42f42b086bdaf31d738e398
2016-04-18 18:35:09 +00:00
Dan Austin 7984620461 Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase." 2016-04-18 18:23:11 +00:00
Neil Fuller eed17d84cc Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
(cherry picked from commit b08544ed7d)

Change-Id: Ie82600da21a9dbe2348e96aef1c5e966a7a1ef5a
2016-04-18 16:38:54 +01:00
Yabin Cui 0e131e7e2c Use strip mode mini-debug-info by default.
Bug: 27923447
Change-Id: If52eed69ea5c2e91bffacdb8520bf53deafced3e
2016-04-15 17:42:17 -07:00
Yabin Cui 3cb18efc4a Merge "Add strip mode mini-debug-info."
am: 9a02623

* commit '9a02623eb66519a2b4607daa883607e893f7727f':
  Add strip mode mini-debug-info.

Change-Id: Ia856b0af684e62b2d17a4a92015afcb02992f523
2016-04-16 00:33:39 +00:00
Yabin Cui 9a02623eb6 Merge "Add strip mode mini-debug-info." 2016-04-16 00:23:50 +00:00
Yabin Cui fab7995cd8 Add strip mode mini-debug-info.
Mini-debug-info strip mode strips most debug information, but
maintains minimal debugging information similar to
https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html.

Bug: 27923447

Change-Id: I0405f0b3c33cb3cadeafbd22ce94d645c4dbe7b9
2016-04-15 16:12:00 -07:00
Tao Bao 4aea5186ef Merge "Skip verifying the partition with no changed blocks."
am: 44a22a3

* commit '44a22a34f72936f7006ce50510c2d54d19b5d798':
  Skip verifying the partition with no changed blocks.

Change-Id: Id3ef138022f19be23a26cd42868b2395c313acb8
2016-04-15 04:07:16 +00:00
Treehugger Robot 44a22a34f7 Merge "Skip verifying the partition with no changed blocks." 2016-04-15 04:03:42 +00:00
Tao Bao 962dfdcdac Skip verifying the partition with no changed blocks.
For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.

[1]: commit d522bdc9ed

Bug: 27813356
Bug: 28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
(cherry picked from commit f9efe284a4)
2016-04-14 20:23:17 -07:00
Tao Bao 9dba034d25 Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
am: 8191f12

* commit '8191f1231dfe45923e8a060635bf7ccbe025a665':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: Ia035b329e08ac6baeb1a48de0bc59ae23771b7c8
2016-04-14 23:22:55 +00:00
Treehugger Robot 8191f1231d Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." 2016-04-14 23:14:07 +00:00
Tao Bao d5cd404f6e Makefile: Pack squashfs and f2fs tools into otatools.zip.
The following tools are essential to create squashfs and f2fs images
during signing (if applicable).

squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh

Bug: 28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
(cherry picked from commit cffaf73f84)
2016-04-14 15:13:46 -07:00
Yohann Roussel bd65cc387b Merge "Allow to force min sdk given to Jack"
am: 6f4f2a7

* commit '6f4f2a77939e8de843a9eb70e92e32c8054d74d5':
  Allow to force min sdk given to Jack

Change-Id: I029e852c82cd2fd20739b466917542211397757c
2016-04-14 21:33:33 +00:00
Yohann Roussel 6f4f2a7793 Merge "Allow to force min sdk given to Jack" 2016-04-14 21:14:38 +00:00
Yohann Roussel 109141ccc9 Allow to force min sdk given to Jack
Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420
Change-Id: I1b84ad8a7b6ae30639f8ade455c1e542af5692e4
2016-04-14 20:59:47 +00:00
Ying Wang cb9847c8ab Merge "Reject Google\'s build of JDK."
am: 98f7a5c

* commit '98f7a5c7446ceae437642934f3e49c870deb8066':
  Reject Google's build of JDK.

Change-Id: Ie818a54ea90d960e4b570b96c006e51e32d8b76f
2016-04-14 18:58:23 +00:00
Ying Wang 98f7a5c744 Merge "Reject Google's build of JDK." 2016-04-14 18:49:07 +00:00
Ying Wang 22b23b9b00 Reject Google's build of JDK.
Bug: 28097637
Change-Id: I8afbd48230bdd1f198a873f72df1c178bed38d0e
2016-04-14 11:34:04 -07:00
David Zeuthen 93a34234c6 Merge "Add support for Brillo partitioning."
am: 2528968

* commit '2528968871cb43a775b059a9300a7cd907c3cfce':
  Add support for Brillo partitioning.

Change-Id: I64897c61190f0674ec006d3ddf3af4342d9b8970
2016-04-14 16:16:35 +00:00
David Zeuthen 2528968871 Merge "Add support for Brillo partitioning." 2016-04-14 16:04:30 +00:00
Tao Bao f7d976f6e9 Merge "releasetools: Only verify the blocks to be touched."
am: 08d2a64

* commit '08d2a6450516901a1de69b5b372cefffd4d506b3':
  releasetools: Only verify the blocks to be touched.

Change-Id: I0dabfa0ca027c448d34451bdbd5026be318c68d5
2016-04-14 01:00:23 +00:00
Treehugger Robot 08d2a64505 Merge "releasetools: Only verify the blocks to be touched." 2016-04-14 00:53:39 +00:00
Tao Bao d4caaae160 releasetools: Only verify the blocks to be touched.
For incremental BBOTAs, we used to verify the integrity of all the
blocks in the source partition. In order to reduce the time cost under
recovery, this CL changes to only verify the blocks that will be touched
in the given OTA package (BBOTA >= 3 only). This is a trade-off between
performance and reliability.

Bug: 27813356
Change-Id: I3975ae6f461f0f7e58d24f1df7df46a449d2988b
(cherry picked from commit d522bdc9ed)
2016-04-13 17:00:34 -07:00