Commit Graph

13984 Commits

Author SHA1 Message Date
Tobias Thierer 75ebdd6e7d droiddoc: Fix trailing ':' in -classpath, -sourcepath values
full_java_lib_deps has trailing whitespace if $(LOCAL_CLASSPATH)
is empty. Because the calculation of PRIVATE_CLASSPATH was
missing a $(strip ...), this resulted in an (unintentional)
trailing ':' in the values of the -classpath and -sourcepath
arguments to the javadoc tool, which that tool is documented
to interpret as '.' (the working directory).

This CL converts the expression to a call to normalize-path-list,
from definitions.mk, which contains the $(strip ...):

define normalize-path-list
$(subst $(space),:,$(strip $(1)))
endef

After this CL, an empty $(LOCAL_CLASSPATH) no longer gets
misinterpreted as the current working directory.

This issue was minor (it made no difference in practice).

Test: Treehugger
Bug: 62049770

Change-Id: Ia0e3e5657d0fa057fe998515f34bc7b8df5f6f16
2017-07-20 19:46:18 +01:00
Colin Cross e97e69359a Use java prebuilts
Point the make java variables at JDK prebuilts in
prebuilts/jdk/jdk8, add them to the path, and clean up
some old overrides.

Reapplies Ibbeb30fab96e45aedd5bb6d710d1170f85789982 after updating
some more manifests to include the prebuilts.

Bug: 62956999
Test: m -j checkbuild
Change-Id: I9e27aa5cb04d1ed09e43b798e5d654843afc000f
(cherry picked from commit 1931750940)
2017-07-20 15:14:26 +00:00
Tobias Thierer c2e69092c0 Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd am: 3a88054509 am: 84910a47c8
am: 2b4f281142

Change-Id: Id15778c7e8747069c6e09e3dacf1f98fcc79ceeb
2017-07-20 08:33:02 +00:00
Tobias Thierer 2b4f281142 Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd am: 3a88054509
am: 84910a47c8

Change-Id: I2d72f81e784cfd64de925611357c4ea643ed6ac8
2017-07-20 08:29:04 +00:00
Tobias Thierer 84910a47c8 Merge "Drop obsolete javac -extdirs commandline arg." am: 43440c22dd
am: 3a88054509

Change-Id: Ie0d592b4d97f46e8d369c63c9a9e82bfeacb419d
2017-07-20 08:25:33 +00:00
Tobias Thierer 3a88054509 Merge "Drop obsolete javac -extdirs commandline arg."
am: 43440c22dd

Change-Id: I7d5736b6b5760341aca1a8810f13d999733bc68a
2017-07-20 08:22:03 +00:00
Tobias Thierer 43440c22dd Merge "Drop obsolete javac -extdirs commandline arg." 2017-07-20 08:17:34 +00:00
Jiyong Park 5ae0097f6f Apks are again allowed to use vendor libs as before
When BOARD_VNDK_VERSION is set, native libs that were labeled as
native:platform are now divided into native:platform and native:vendor
sets depending on their install locations. In order to keep the existing
apks to use all the libraries that they have been using, native:vendor
is also added to the allowed types for apks.

However, in the future when we have vendor SDK and enforce all vendor
apks to use the vendor SDK, we will disallow native:vendor to
app:platform and native:vendor will be allowed only to those vendor apks
(probably labeled as app:vendor).

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m <a vendor lib using vendor jni>
(e.g. ModemDiagnosticSystem in internal master)

Change-Id: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b
2017-07-20 13:48:56 +09:00
Colin Cross 443529098c Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp
am: 00f21a2360

Change-Id: Ib1186289e955e0b6f35285a192b2e02d8996f4ee
2017-07-19 23:08:25 +00:00
Colin Cross f2da657628 Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25
am: 96018b3d10

Change-Id: Ib54b8c0fbb95179bff97abe028d133da3528380f
2017-07-19 22:58:23 +00:00
Colin Cross 96018b3d10 Merge "Revert "Use java prebuilts"" am: 4d69df5191
am: f4e78ccf25

Change-Id: I1b0bfaa059f68e09c115662ca9f850213305b8f0
2017-07-19 22:55:23 +00:00
Colin Cross f4e78ccf25 Merge "Revert "Use java prebuilts""
am: 4d69df5191

Change-Id: I978bf3d25e0be2a2a6b40c5b396821cc2a8d9365
2017-07-19 22:52:21 +00:00
Colin Cross 4d69df5191 Merge "Revert "Use java prebuilts"" 2017-07-19 22:44:12 +00:00
Colin Cross 02112900cc Revert "Use java prebuilts"
This reverts commit 1931750940.

Change-Id: I7a99fd6c53d35a2a674f2d60b113a727f3c453ce
2017-07-19 22:42:46 +00:00
Colin Cross 0141bf4008 Merge "Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp am: 7b38914e4e" into oc-dr1-dev-plus-aosp
am: d2d0e31200

Change-Id: Iea40d864193eead68603aac150a5e02d0060728d
2017-07-19 22:24:35 +00:00
Colin Cross 1a05e52e6d Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp
am: 7b38914e4e

Change-Id: I61313e8009c964868cf4984a7f86811748e98819
2017-07-19 22:19:03 +00:00
Colin Cross 7d7f4cd7bb Merge "Use java prebuilts" am: 26e1b6d6c2
am: fcbaa25380

Change-Id: I27e44fa8d649092327b3543f440fae65b36c054c
2017-07-19 22:16:07 +00:00
Colin Cross fcbaa25380 Merge "Use java prebuilts"
am: 26e1b6d6c2

Change-Id: If761856f9fd509d2c5694844b6bb10966717e0b1
2017-07-19 22:13:09 +00:00
Colin Cross 26e1b6d6c2 Merge "Use java prebuilts" 2017-07-19 22:08:48 +00:00
Adam Seaton 32f388f655 Updating Security String to 2017-09-05 Bug:63846344 2017-07-19 10:42:03 -07:00
Adam Seaton f1c17f17ff Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 10:41:05 -07:00
Tobias Thierer 5a00891df9 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc am: 675d7d56e8
am: bce2e113b4

Change-Id: I58a4c89f9f564c633b1d1f8ee31f5b06b16fdc6b
2017-07-19 10:11:59 +00:00
Tobias Thierer bce2e113b4 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc
am: 675d7d56e8

Change-Id: Iaccc55cb744edb3375173ea11ee040bb8c220f61
2017-07-19 10:06:30 +00:00
Tobias Thierer 675d7d56e8 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
am: 32b8d637dc

Change-Id: I337488a0d6d75f8f6635c57c916b6b337ff35f65
2017-07-19 10:01:00 +00:00
Tobias Thierer 32b8d637dc Merge "Make 'make docs' work on OpenJDK 9 toolchain."
am: 8003d944a1

Change-Id: Ib15f74276865c690631e709d002920cc2a63494c
2017-07-19 09:55:30 +00:00
Tobias Thierer 8003d944a1 Merge "Make 'make docs' work on OpenJDK 9 toolchain." 2017-07-19 09:49:33 +00:00
Steven Moreland c0ee08020a Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d am: f88b6bd7d8
am: 07d26d46d0

Change-Id: I09cf9fa8fc080ec486d801fb143e5782e16f4fc4
2017-07-19 01:51:33 +00:00
Ivan Lozano 3d055100c9 Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941 am: 7e18525ef7
am: d86676e30a

Change-Id: Ic23f9dcef1a3c97a67c98f3af4fb636b0c825628
2017-07-19 01:50:35 +00:00
Steven Moreland 07d26d46d0 Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d
am: f88b6bd7d8

Change-Id: Idd3421a6e4c23186fe689f57bd252a7276b84799
2017-07-19 01:46:32 +00:00
Steven Moreland f88b6bd7d8 Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2
am: 2d05df376d

Change-Id: I26ee312c390514a55e03628bfb6d6496588feba7
2017-07-19 01:44:32 +00:00
Steven Moreland 2d05df376d Merge "Remove JNI_H_INCLUDE from make."
am: cc96704ad2

Change-Id: I91ff6ba31fb53960f00398777f1f213dbcda10a8
2017-07-19 01:40:32 +00:00
Ivan Lozano d86676e30a Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941
am: 7e18525ef7

Change-Id: Ie34681ed0c12c77cd45f7b7ebb5bc636a9dd4d9f
2017-07-19 01:34:32 +00:00
Treehugger Robot cc96704ad2 Merge "Remove JNI_H_INCLUDE from make." 2017-07-19 01:33:50 +00:00
Ivan Lozano 7e18525ef7 Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86
am: 815c1f5941

Change-Id: Ica0a1e973f7cc6794866d6317ddff39fa72edc9a
2017-07-19 01:19:36 +00:00
Ivan Lozano 815c1f5941 Merge "Allow integer_overflow sanitizer path exclusion."
am: ad9dde8a86

Change-Id: Ib1dad032780d7c3ac36b69a3350bd1b07f9a1358
2017-07-19 01:14:40 +00:00
Ivan Lozano ad9dde8a86 Merge "Allow integer_overflow sanitizer path exclusion." 2017-07-19 01:06:28 +00:00
Ivan Lozano 9a82bfdc68 Allow integer_overflow sanitizer path exclusion.
Add support for excluding paths from having integer_overflow applied to
them when using SANITIZE_TARGET=integer_overflow via an
INTEGER_OVERFLOW_EXCLUDE_PATHS make and product variable. This covers
the make side of the change.

Bug: 30969751
Test: Build with SANITIZE_TARGET=integer_overflow
SANITIZE_TARGET_DIAG=integer_overflow
INTEGER_OVERFLOW_EXCLUDE_PATHS=<path> and confirmed this was no
longer being applied to binaries in that path.

Change-Id: I24e328257bc5a7962024c8676a1e23d7d70a8666
2017-07-18 15:14:22 -07:00
Steven Moreland 5d3b159bfb Remove JNI_H_INCLUDE from make.
It's now specified and exported from Soong.

Bug: 63762847
Test: make libraries find their headers

Change-Id: Ica5afe7465d90230628f3a924e929df38d25cdd9
2017-07-18 14:44:21 -07:00
Tobias Thierer 78d2983566 Drop obsolete javac -extdirs commandline arg.
The extension directory defaults to lib/ext and does not
exist by default. Setting it to the empty string de facto
disables this obsolete feature.

AOSP is moving to a hermetic toolchain so this argument
will stop working soon. Further, OpenJDK 9 javac no longer
supports this command line argument when compiling for
-source 1.9 -target 1.9.

This command line argument has been around since the
earliest versions of Android, but is now obsolete.
This CL drops it.

Bug: 63746471
Test: Treehugger
Change-Id: Ia0214c1b192e3ffda10772d777557a81ce346c03
2017-07-18 16:17:15 +01:00
Tobias Thierer 0b05860556 Make 'make docs' work on OpenJDK 9 toolchain.
OpenJDK 9's javadoc tool doesn't support the -bootclasspath
command line option, even with -source 1.8.

Instead, under OpenJDK 9, javadoc needs to be passed a
--patch-module argument to tell it the location of the
classes patching packages from java.* modules.

The source files in libcore/{dalvik,libart,luni,ojluni} and
external/icu/android_icu4j that go into PRIVATE_BOOTCLASSPATH
patch packages from the modules java.base, java.desktop,
java.logging, java.prefs, java.sql, jdk.net, and
jdk.unsupported. However, this CL takes the simpler approach
of placing them all in java.base, which appears to work for
the purposes of the javadoc run.

Test: Ran the following both on OpenJDK 8 toolchain and on
      OpenJDK 9 (with EXPERIMENTAL_USE_OPENJDK9=true):
      rm -rf out/target/common/docs/ && make docs
Test: Compared (via meld) the contents of out/target/common/docs
      for the two toolchains (there were some differences, see bug).
Bug: 62049770

Change-Id: If3dd927477ca32dab7ffb528350de872e1017184
2017-07-18 16:03:35 +01:00
Colin Cross 90ac222290 Merge "Revert "Use dx.jar directly"" am: c7e3e962f8 am: 4cea760106 am: 3f273622f4
am: f113b854b1

Change-Id: I6c01dcc44a931685b81c91cd5cbee15fd7cfa3ca
2017-07-18 07:31:33 +00:00
Colin Cross f113b854b1 Merge "Revert "Use dx.jar directly"" am: c7e3e962f8 am: 4cea760106
am: 3f273622f4

Change-Id: Iea8d21663dfdbd490c3aad69e405c5b6d014cf97
2017-07-18 07:25:36 +00:00
Colin Cross 3f273622f4 Merge "Revert "Use dx.jar directly"" am: c7e3e962f8
am: 4cea760106

Change-Id: Ifc9f3c171a8798968d07d7a3a87bff43c24048e4
2017-07-18 07:20:06 +00:00
Colin Cross 4cea760106 Merge "Revert "Use dx.jar directly""
am: c7e3e962f8

Change-Id: Icd5402f7cc789224753537c070a91cbf6267ee66
2017-07-18 07:14:26 +00:00
Treehugger Robot c7e3e962f8 Merge "Revert "Use dx.jar directly"" 2017-07-18 07:08:19 +00:00
Colin Cross e44e75aa89 Revert "Use dx.jar directly"
This reverts commit e37a3c959a.

Reason for revert: breaks art test runner

Change-Id: Ice0cd3020ddec7f31eb789867a45f047a75a05d0
2017-07-18 05:22:59 +00:00
Colin Cross 5ac450547f Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41 am: 5cf757bb85
am: 5a6cc2bda2

Change-Id: I2cf7ac7e33295df66c9e605bc2b473e458b4ab18
2017-07-17 20:58:00 +00:00
Jeff Gaston c1d097ccab Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3 am: 7ce0d9c1e7
am: a72da88c31

Change-Id: Ifba3d8ecec0aad8065f51525e68c3e2a7b6631fd
2017-07-17 20:55:14 +00:00
Colin Cross 5a6cc2bda2 Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41
am: 5cf757bb85

Change-Id: I1c2b1f760b34b76fb63ac0ad7816680a7dc9d3a0
2017-07-17 20:53:12 +00:00
Jeff Gaston a72da88c31 Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3
am: 7ce0d9c1e7

Change-Id: Id57cc47edc61a7e30dc4fcf4f113ee9ce85a4b7f
2017-07-17 20:52:40 +00:00
Colin Cross 5cf757bb85 Merge "Use dx.jar directly" am: c68434c971
am: 4828fcad41

Change-Id: I0e65499eaf42aef400be07868e40454cd1c2d5ac
2017-07-17 20:49:10 +00:00
Jeff Gaston 7ce0d9c1e7 Merge "Update to latest jacoco usage" am: 483fae7430
am: 6264b662f3

Change-Id: Icd22319fb34575925c140e619b5f099fa68b0ab0
2017-07-17 20:48:40 +00:00
Colin Cross 4828fcad41 Merge "Use dx.jar directly"
am: c68434c971

Change-Id: Ief2c88d3ba0e93c7eb7bb9db0ac2b0a0b886bcea
2017-07-17 20:45:31 +00:00
Jeff Gaston 6264b662f3 Merge "Update to latest jacoco usage"
am: 483fae7430

Change-Id: Ibc94d5ba6db7690441825dd655b6cb26d989b78d
2017-07-17 20:44:10 +00:00
Colin Cross c68434c971 Merge "Use dx.jar directly" 2017-07-17 20:40:13 +00:00
Jeff Gaston 483fae7430 Merge "Update to latest jacoco usage" 2017-07-17 20:36:39 +00:00
Dan Willemsen 545c356675 Merge "Enable missing dependency checks" 2017-07-15 04:18:34 +00:00
Bowgo Tsai 1799d360b5 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740 am: 9a797706b5
am: 5cf6551455

Change-Id: I701c2708b9945f543e03b583d505ca947ebd63f6
2017-07-15 00:10:39 +00:00
Bowgo Tsai 5cf6551455 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740
am: 9a797706b5

Change-Id: Ibdd8307b5cc72007d76929ca8c4db1ce20f33f15
2017-07-15 00:06:34 +00:00
Bowgo Tsai 9a797706b5 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3
am: bd91ac7740

Change-Id: I26cd1570d7cba2704339b60f00fa09ddd689611a
2017-07-15 00:02:03 +00:00
Bowgo Tsai bd91ac7740 Merge "custom_images: support verity fec (forward error correction)"
am: abf553c9d3

Change-Id: I4b6e678859538ac91fc2548fc7195677660af37c
2017-07-14 23:58:45 +00:00
Treehugger Robot abf553c9d3 Merge "custom_images: support verity fec (forward error correction)" 2017-07-14 23:51:47 +00:00
Tianjie Xu e79e9c9dfd Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1 am: a07a04c737 am: 4b53a17756
am: a4caab580c

Change-Id: I07d7ddfe8e27e0262210b21218895ef216b41727
2017-07-14 23:38:32 +00:00
Tianjie Xu a4caab580c Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1 am: a07a04c737
am: 4b53a17756

Change-Id: If03919b9012f4a693e895b02a0c148eeb0a4da5e
2017-07-14 23:34:39 +00:00
Tianjie Xu 4b53a17756 Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1
am: a07a04c737

Change-Id: I5f2b92791a759def118c6aa70a3e0777a9e8da85
2017-07-14 23:30:32 +00:00
Tianjie Xu a07a04c737 Merge "Generate brotli compressed {}.new.dat for full OTA"
am: 1b28eca1a1

Change-Id: I3474e8efb634513fbc4876e5c272cf56b3443e12
2017-07-14 23:27:21 +00:00
Tianjie Xu 1b28eca1a1 Merge "Generate brotli compressed {}.new.dat for full OTA" 2017-07-14 23:21:54 +00:00
Colin Cross b4b33a6d67 Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed am: 06f8dec6e0 am: 453fcba264
am: dcd3182250

Change-Id: Idc05e56b7f34bfc8fcd8e8d3380f0457a7e82967
2017-07-14 23:21:48 +00:00
Colin Cross dcd3182250 Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed am: 06f8dec6e0
am: 453fcba264

Change-Id: If63096b530ba19c62db7afd95f4d9620cc5fccfd
2017-07-14 23:17:30 +00:00
Colin Cross 453fcba264 Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed
am: 06f8dec6e0

Change-Id: I348fda356863ef77e166782a666233239c1bde32
2017-07-14 23:13:31 +00:00
Colin Cross 06f8dec6e0 Merge "Fix LOCAL_JAR_PROCESSOR dependency"
am: 126e625fed

Change-Id: Ibe2786aa8853ea34513903728ae06fb5c5c39101
2017-07-14 23:10:57 +00:00
Treehugger Robot 126e625fed Merge "Fix LOCAL_JAR_PROCESSOR dependency" 2017-07-14 23:06:48 +00:00
Colin Cross 1931750940 Use java prebuilts
Point the make java variables at JDK prebuilts in
prebuilts/jdk/jdk8, add them to the path, and clean up
some old overrides.

Bug: 62956999
Test: m -j checkbuild
Change-Id: Ibbeb30fab96e45aedd5bb6d710d1170f85789982
2017-07-14 14:18:53 -07:00
Jeff Gaston aaae43cd24 Update to latest jacoco usage
Bug: 36792868
Test: EMMA_INSTRUMENT_STATIC=true m -j

Change-Id: I419b543283b52be9a72f5c6b10e4cbea68782174
2017-07-14 13:04:05 -07:00
Steven Moreland fcec4ec8d7 Merge "Define paths for vendor native tests." am: f4f8e91a5d am: c9bc937d6d am: 4e3bdda4e9
am: 215b687f76

Change-Id: I9c1694fe54a8e8c5c3080b60c7381a4afd70d346
2017-07-14 18:52:13 +00:00
Steven Moreland 215b687f76 Merge "Define paths for vendor native tests." am: f4f8e91a5d am: c9bc937d6d
am: 4e3bdda4e9

Change-Id: Ic634722e1ebf5f6fdaa078c16532060d2590f042
2017-07-14 18:49:12 +00:00
Steven Moreland 4e3bdda4e9 Merge "Define paths for vendor native tests." am: f4f8e91a5d
am: c9bc937d6d

Change-Id: I2a5d0d84fd9613358e950695ca46d0b8e24c2620
2017-07-14 18:45:42 +00:00
Steven Moreland c9bc937d6d Merge "Define paths for vendor native tests."
am: f4f8e91a5d

Change-Id: I723f27e825fd210db12a26adef003bbd166f215c
2017-07-14 18:42:10 +00:00
Treehugger Robot f4f8e91a5d Merge "Define paths for vendor native tests." 2017-07-14 18:34:59 +00:00
Tianjie Xu b0a29ad8c2 Generate brotli compressed {}.new.dat for full OTA
Brotli has a better compression ratio than deflation. So for non-AB
full OTA, we can compress the new.dat with brotli first and store it
in the zip package.
This increase the OTA generation time by ~5 minutes for a full OTA
(measured based on 2.0G system.new.dat)

Bug: 34220646
Test: Generate a full OTA for bullhead
Change-Id: I9c0550af8eafcfa68711f74290c8e2d05a96648f
2017-07-14 10:53:21 -07:00
Bowgo Tsai 8ec2a1cb08 custom_images: support verity fec (forward error correction)
Bug: 63691195
Test: `make custom_images` with CUSTOM_IMAGE_SUPPORT_VERITY_FEC := true
Test: boot device with the custom image built above

Change-Id: I198fa1e0697cb00712bbfb6f1a717ec623703ede
2017-07-14 21:47:13 +08:00
Jiyong Park 3b6c3ca4a7 Merge "Don't allow JNI headers for vendors" am: b253e8e854 am: 9e89245a2c am: 9fc093f932
am: 59d5727193

Change-Id: Ib7cb0c7201ef595c619cf3f901bb3a3790a31473
2017-07-14 03:49:49 +00:00
Jiyong Park 59d5727193 Merge "Don't allow JNI headers for vendors" am: b253e8e854 am: 9e89245a2c
am: 9fc093f932

Change-Id: I3a4c608ea4893961f20addefb7e355743e38e47d
2017-07-14 03:46:20 +00:00
Jiyong Park 9fc093f932 Merge "Don't allow JNI headers for vendors" am: b253e8e854
am: 9e89245a2c

Change-Id: I6f7269591191453131aae56ec44cabe41683c419
2017-07-14 03:42:49 +00:00
Jiyong Park 9e89245a2c Merge "Don't allow JNI headers for vendors"
am: b253e8e854

Change-Id: I6e3de31f388150301db9f0d0dd1bee3b7e39f413
2017-07-14 03:39:49 +00:00
Treehugger Robot b253e8e854 Merge "Don't allow JNI headers for vendors" 2017-07-14 03:34:50 +00:00
Colin Cross 89b802b994 Fix LOCAL_JAR_PROCESSOR dependency
The LOCAL_JAR_PROCESSOR rule should depend on the path to the
processor jar and not the module name.

Test: m -j && m -j
Change-Id: I5ebd4cd3ad4429918edfd0a8cb5cb9a4e7e86ca7
2017-07-13 19:25:47 -07:00
Steven Moreland cbfba70a9f Define paths for vendor native tests.
Test: manually check paths are desired using:
  $(error $(TARGET_OUT_VENDOR_NATIVE_TESTS))
  with both 'm -j' and 'm -j BOARD_VNDK_VERSION=current'
Fixes: 62495833
Change-Id: I236718f845d8ab604a0aec06b3220bc1c4f3d36b
2017-07-13 15:46:00 +00:00
Jiyong Park b43a52d79d Don't allow JNI headers for vendors
This is already blocked in Soong. Do the same for make.

Bug: 63553556
Test: BOARD_VNDK_VERSION=current m -j libSampleAuthJNI cannot be built
Change-Id: I04a89b3f9de903a6b0384f13d5a80886344c14b4
2017-07-13 15:51:07 +09:00
Jiyong Park c32a968605 Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6 am: 240f1d5ffe am: e6cab73dcd
am: 91dfb75cb4

Change-Id: I13fdfd4a6dd2bcdd803c0881648c5a70dc2220a8
2017-07-12 21:01:52 +00:00
Jiyong Park 91dfb75cb4 Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6 am: 240f1d5ffe
am: e6cab73dcd

Change-Id: I192db2c4f76782f3df33287f5f5a98c15a1653a0
2017-07-12 20:59:23 +00:00
Jiyong Park e6cab73dcd Merge "fix: device_kernel_headers can't be found in the make world" am: 1aa29599c6
am: 240f1d5ffe

Change-Id: Icd3959c1415b7ce2f4162a460faf076f2ad38b79
2017-07-12 20:56:53 +00:00
Jiyong Park 240f1d5ffe Merge "fix: device_kernel_headers can't be found in the make world"
am: 1aa29599c6

Change-Id: Ic588932665fe23e7bc50ec6a751aad3449a52018
2017-07-12 20:54:23 +00:00
Jiyong Park cb8e636ed0 fix: device_kernel_headers can't be found in the make world
Since device_kernel_headers is marked as 'vendor:true', it is exported
to the make world as device_kernel_headers.vendor. Use the correct name
with the .vendor suffix.

Bug: none
Test: BOARD_VNDK_VERSION=current m -j does not complain about
device_kernel_headers.

Change-Id: If3eaa3c5832820c914ef427668d70fa8d8d0bf97
2017-07-12 18:29:17 +09:00
Howard Chen 133a64829e Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0 am: e4b1bdaa9e
am: fd3340ee6f

Change-Id: I62b58c6cc623f1fa591ff2dc2a3eaefa9e30d995
2017-07-11 02:17:27 +00:00
Howard Chen fd3340ee6f Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0
am: e4b1bdaa9e

Change-Id: I70674dc5b25aa224b56df45ab526fc5addfe9846
2017-07-11 02:14:55 +00:00
Howard Chen e4b1bdaa9e Merge "Support kernel modules in the odm image" am: 95a8c7e83f
am: 1b0da968a0

Change-Id: Ic59862cdc3314ffc99df4955cf20aaacc34f2209
2017-07-11 02:12:26 +00:00
Howard Chen 1b0da968a0 Merge "Support kernel modules in the odm image"
am: 95a8c7e83f

Change-Id: Ib34b1eb969b5fffba4040f40143ea1f3679d4913
2017-07-11 02:10:24 +00:00
Howard Chen 0c5f1e575d Support kernel modules in the odm image
This patch reuses the build-image-kernel-modules macro to build the
odm/lib/modules directory according to the BOARD_ODM_KERNEL_MODULES
which contains list of kernel module files.

Bug: 36012197
Test: android master build on pixel
Change-Id: I2c004132a89e7f230690b4d26c98c3d5b2769f11
2017-07-10 10:44:58 +08:00
Jiyong Park a23d4bc84e Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662 am: be8d64294c am: 978a3cf1aa
am: d597e27485

Change-Id: I5dd42bb51a6e9e01f5fe7c204a1fabcfb947e6c1
2017-07-08 03:26:00 +00:00
Jiyong Park d597e27485 Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662 am: be8d64294c
am: 978a3cf1aa

Change-Id: I4c89980bb4678a3ca0b108dc0920c57014cf91d7
2017-07-08 03:23:26 +00:00
Jiyong Park 978a3cf1aa Merge "Device-specific kernel headers are accessbile again" am: 6f594fc662
am: be8d64294c

Change-Id: Iad93bbe6e25ee63474cabbcab8214d04b33b91ab
2017-07-08 03:21:26 +00:00
Jiyong Park be8d64294c Merge "Device-specific kernel headers are accessbile again"
am: 6f594fc662

Change-Id: Icffe772cc97a39fceb21e0a22a3776313bbefa1f
2017-07-08 03:18:56 +00:00
Mathieu Chartier 7c826ad3a3 Merge "Add support for using profiles for boot images" 2017-07-08 01:42:51 +00:00
Jiyong Park 0c59dab590 Device-specific kernel headers are accessbile again
Device-specific kernel headers (TARGET_PROJECT_SYSTEM_INCLUDES) have
been added to the global include paths. However, since global include
paths are no longer provided when a lib is built for vendors, the
device-specific kernel headers becomes inaccessible. To solve this
problem, a pseudo header library 'device_kernel_headers' is defined
and it is added to all Android.mk defined lib/bins.

Also, in order to give this info to the soong world,
TARGET_PROJECT_SYSTEM_INCLUDES is exported as a new product config
DeviceKernelHeaders.

Bug: 62939405
Test: choosecombo to aosp_sailfish (or any other Pixel/Nexus targets)
BOARD_VNDK_VERSION=current m -j gralloc.msm8996 (or any other vendor
libs using vendor-specific kernel headers)

Change-Id: I3f0a2b893cc9352d6c13f3151e8834477d15c07b
2017-07-08 10:16:23 +09:00
Mathieu Chartier 77226f6333 Add support for using profiles for boot images
Added two product flags:
PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION

If PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE is enabled (default false), a
art profile is used to create the preopted boot image. This profile
is also passed to the runtime in AndroidRuntime.cpp.

The profile is created from the
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION variable that defaults
to "frameworks/base/boot-image-profile.txt".

Bug: 37966211
Test: make and flash

Change-Id: Ic89cc4c0c4d39aa9726843f5d9c2fb1dedeb7885
2017-07-07 16:48:02 -07:00
Jiyong Park c83015fbc0 Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac am: e51b222801 am: 8012c195f8
am: 8735a66b27

Change-Id: If0487fd709a086c10833c470b234c449c4e95cdd
2017-07-07 22:37:09 +00:00
Jiyong Park 8735a66b27 Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac am: e51b222801
am: 8012c195f8

Change-Id: I30865a364c14438668d2ecd1bcbd68c735eeb24d
2017-07-07 22:34:38 +00:00
Jiyong Park 8012c195f8 Merge "Give TARGET_OUT_HEADERS to vendor modules" am: c86c8502ac
am: e51b222801

Change-Id: Ia279239c72e0cc5f0dc74959301ce4009c9172a4
2017-07-07 22:32:10 +00:00
Jiyong Park e51b222801 Merge "Give TARGET_OUT_HEADERS to vendor modules"
am: c86c8502ac

Change-Id: I2d9ca861cbac74b6e14ee843717e41ddc855bd91
2017-07-07 22:30:08 +00:00
Treehugger Robot c86c8502ac Merge "Give TARGET_OUT_HEADERS to vendor modules" 2017-07-07 22:25:00 +00:00
Colin Cross e37a3c959a Use dx.jar directly
Use $(JAVA) to invoke dx.jar instead of the dx wrapper script.
Also allow the dx command line or the dx jar to be specified on
the command line.  Allows better dependencies on dx.jar, and
doesn't rely on having java on the path.

Bug: 62956999
Test: m -j checkbuild
Change-Id: I5f265132690ad28b3139954fea44eb0c4a43393a
2017-07-07 13:34:33 -07:00
Colin Cross 11a2206f42 Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f am: 54c8cb91b8
am: 4ef344a5dd

Change-Id: Ide195aee950ccd6ac2995cc389d3f55351c4e5d2
2017-07-07 20:31:46 +00:00
Colin Cross 4ef344a5dd Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f
am: 54c8cb91b8

Change-Id: I0c8cd66738b37aabc3191449a99dc781b6132225
2017-07-07 20:29:19 +00:00
Colin Cross 54c8cb91b8 Merge "Refactor prebuilt tools" am: bc45a33c93
am: 68016fc55f

Change-Id: I0e98ee6b74806c3bce15d9256a25378d2703358b
2017-07-07 20:26:47 +00:00
Colin Cross 68016fc55f Merge "Refactor prebuilt tools"
am: bc45a33c93

Change-Id: I689375970e4e4045d986b62a21f8ed7aa4e34a38
2017-07-07 20:24:15 +00:00
Ivan Lozano 2228f3682c Merge "Add integer_overflow sanitization build option." am: 05900230fd am: 344306a4ac am: 046d1535fa
am: 4e684f5adb

Change-Id: I1ba55b0b05b5554d9de23ffb64231a4f091c11fe
2017-07-07 20:21:58 +00:00
Colin Cross bc45a33c93 Merge "Refactor prebuilt tools" 2017-07-07 20:19:24 +00:00
Ivan Lozano 4e684f5adb Merge "Add integer_overflow sanitization build option." am: 05900230fd am: 344306a4ac
am: 046d1535fa

Change-Id: I508544155ee260ef6249676910475ca7808ca5dc
2017-07-07 20:17:30 +00:00
Ivan Lozano 046d1535fa Merge "Add integer_overflow sanitization build option." am: 05900230fd
am: 344306a4ac

Change-Id: I79cf44e4fc20d2dd1317bb0614f6a41d73202524
2017-07-07 20:15:00 +00:00
Ivan Lozano 344306a4ac Merge "Add integer_overflow sanitization build option."
am: 05900230fd

Change-Id: Id2dcea2042497ddcb7bb0b83eebee583fe3c13f8
2017-07-07 20:12:56 +00:00
Ivan Lozano 05900230fd Merge "Add integer_overflow sanitization build option." 2017-07-07 20:07:20 +00:00
Colin Cross cd20d5980c Refactor prebuilt tools
Put the prebuilt and non-prebuilt tools selections into the two
clauses of an if block to simplify the next patch.

Test: m -j checkbuild
Change-Id: Idd01bc81a2b619f7fc23df7566a01b46598433a3
2017-07-07 18:16:28 +00:00
Przemyslaw Szczepaniak 1872eb8b9d Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c am: a1847ffedf
am: 07f315d91d

Change-Id: I6def5e7df892fe5d74ab58efaa898fc889549c31
2017-07-07 16:03:58 +00:00
Przemyslaw Szczepaniak 07f315d91d Merge "Enable stripping of java debug information when required." am: d659f806e5 am: 8c485b6b0c
am: a1847ffedf

Change-Id: I085608da575941de51eea8bc8deb7067a3673dd3
2017-07-07 15:56:22 +00:00
Przemyslaw Szczepaniak a1847ffedf Merge "Enable stripping of java debug information when required." am: d659f806e5
am: 8c485b6b0c

Change-Id: If09c1fd1d8c30d1763ef7534e042ef4e3839d1f0
2017-07-07 15:33:11 +00:00
Przemyslaw Szczepaniak 8c485b6b0c Merge "Enable stripping of java debug information when required."
am: d659f806e5

Change-Id: I25facf64b176ae26db07d43cef92c522bf92e79a
2017-07-07 15:29:40 +00:00
Treehugger Robot d659f806e5 Merge "Enable stripping of java debug information when required." 2017-07-07 15:24:32 +00:00
Treehugger Robot ae67473255 Merge "Increase max heap size for javac to 2GB." 2017-07-07 01:57:16 +00:00
Bryan Eyler 3458b5f5a9 Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a am: 1558db6a87
am: 0602eacffe

Change-Id: I85fc208af6c4b173df917bf3cd6e5d0c26e8c72c
2017-07-07 01:38:51 +00:00
Bryan Eyler 0602eacffe Merge "Re-compute DX command if it changes for PDK." am: 7edc11830a
am: 1558db6a87

Change-Id: I01ebe1958d0a337d7875c171c7f680560ef240ea
2017-07-07 01:35:50 +00:00
Bryan Eyler 1558db6a87 Merge "Re-compute DX command if it changes for PDK."
am: 7edc11830a

Change-Id: Ied18008a334db388efe5d396bc3a7186f6c7e327
2017-07-07 01:32:49 +00:00
Ivan Lozano 4a363734b3 Add integer_overflow sanitization build option.
Adds the SANITIZE_TARGET=integer_overflow build option to apply signed and
unsigned integer overflow sanitization globally. This implements the
Make side of the build option.

A LOCAL_SANITIZE_BLACKLIST variable is added to allow blacklists to be
defined in make files, mirroring similar functionality provided in Soong.

An additional build option is provided to control whether or not to run
in diagnostics mode, controlled by SANITIZE_TARGET_DIAG. This works the
same way that SANITIZE_TARGET does and currently only supports
'integer_overflow' as an option.

Bug: 30969751
Test: Building with and without the new flags, device boot-up, tested
various permutations of controlling the new flags from build files.

Change-Id: Iacc47e196f21aa1edff5b406bfbc564b5f4e42bd
2017-07-06 18:21:37 -07:00
Bryan Eyler d4794315ff Re-compute DX command if it changes for PDK.
Bug 62360631
Tested build of PDK.

Test: builds
Change-Id: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
Merged-In: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
(cherry picked from commit af4bde4239)
2017-07-06 16:22:01 -07:00
Colin Cross a12d38a721 Increase max heap size for javac to 2GB.
Compiling Dialer requires increasing the javac heap size above
1GB, probably due to the extensive use of annotation processors.
Increase it to 2GB.

Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I4dd3759a98ea915469e69f563dc49be8a25d518e
Merged-In: I4dd3759a98ea915469e69f563dc49be8a25d518e
(cherry picked from commit 0e785c79b8)
2017-07-06 16:13:00 -07:00
Przemyslaw Szczepaniak 2e81b3c49f Enable stripping of java debug information when required.
We're removing LocalVariableType / LocalVariableType in order to
save space. Enabling stripping reduces AOSP  image size save
by ~12MB.

Bug: 38224820
Test: CtsLibcoreTestCases
Change-Id: I3168d73ec6825aa5879db7e1135d7ed61d488d72
2017-07-06 08:31:14 +00:00
Howard Chen 6cf0960922 Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e am: fd380f20cb am: 0b2aebab08
am: f07747f71f

Change-Id: I1359edef0e8197dbb6184d7a1460fdc1306636f9
2017-07-06 04:18:08 +00:00
Howard Chen f07747f71f Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e am: fd380f20cb
am: 0b2aebab08

Change-Id: I50966ed3c8e3f6bee41484e2d7a77d5471f0bf89
2017-07-06 03:55:24 +00:00
Howard Chen 0b2aebab08 Merge "Add a make maco to convert string to upper case" am: 8eff2d7c8e
am: fd380f20cb

Change-Id: Id2f55d548088375eaf38f6b809be9e804adaf83b
2017-07-06 03:52:53 +00:00
Howard Chen fd380f20cb Merge "Add a make maco to convert string to upper case"
am: 8eff2d7c8e

Change-Id: I86260216cea1c2a6d46599481e19e0063ae576a8
2017-07-06 03:50:54 +00:00
Howard Chen 8eff2d7c8e Merge "Add a make maco to convert string to upper case" 2017-07-06 03:46:07 +00:00
Bowgo Tsai 412138338e Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39
am: 95202bcba6

Change-Id: I9b9a5faf158157fbb34d18c4e7107e137411634d
2017-07-06 01:00:41 +00:00
Bowgo Tsai 95202bcba6 Merge "Align size of vbmeta image to 4k boundary"
am: efb6fddf39

Change-Id: I4ace791408c92f55bc55f2fbf72dfef3ab363a70
2017-07-06 00:58:16 +00:00
Jiyong Park 7f8be9f695 Give TARGET_OUT_HEADERS to vendor modules
Many vendor modules are using headers that are copied to
$(TARGET_OUT_HEADERS)/some/path via LOCAL_COPY_HEADERS. In order to let
them use the headers via #include <some/path/header.h>,
$(TARGET_OUT_HEADERS) is again added to the system include path.

Bug: 63340459
Test: BOARD_VNDK_VERSION=current m -j gives less 'cannot find header'
errors.

Change-Id: I472e74533b437653c76dc416f7f4527c0e90750d
2017-07-06 09:45:26 +09:00
Treehugger Robot efb6fddf39 Merge "Align size of vbmeta image to 4k boundary" 2017-07-06 00:29:52 +00:00
Andreas Gampe ff88d9dcd8 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" am: 691f5cec3a am: 15a5eba089 am: ce7c8f0c54
am: 337a94b1e1

Change-Id: Iec51b6ad6eaa7d4898464fffd449d0763e1c0790
2017-07-05 18:25:36 +00:00
Andreas Gampe 337a94b1e1 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" am: 691f5cec3a am: 15a5eba089
am: ce7c8f0c54

Change-Id: Id4d5883bb255af032665f719918d3f8e618e79d1
2017-07-05 18:22:03 +00:00
Andreas Gampe ce7c8f0c54 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" am: 691f5cec3a
am: 15a5eba089

Change-Id: I24d20f5877a9e41b3f74aeb7b94674d01e991fc9
2017-07-05 18:18:35 +00:00
Andreas Gampe 15a5eba089 Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD"
am: 691f5cec3a

Change-Id: Ia4ba8aa3ed015eaa149484ed0e644d646806ecec
2017-07-05 18:14:34 +00:00
Treehugger Robot 691f5cec3a Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD" 2017-07-05 18:05:36 +00:00
Narayan Kamath b945982cb3 Merge "main.mk: Set dalvik.vm.stack-trace-dir" 2017-07-04 11:29:38 +00:00
Colin Cross 550381f515 Merge "Provide make variables for java binaries" am: 5e19557eb9 am: e885ccf0df am: d8a22925f5
am: 373a13c0ca

Change-Id: If5a60097dcd9986f468a2fbae8a7d23ed44f6453
2017-07-01 01:50:09 +00:00
Colin Cross 373a13c0ca Merge "Provide make variables for java binaries" am: 5e19557eb9 am: e885ccf0df
am: d8a22925f5

Change-Id: I8681d9c889018fe656f5ef4cc380d1a3af8c325f
2017-07-01 01:45:16 +00:00
Colin Cross d8a22925f5 Merge "Provide make variables for java binaries" am: 5e19557eb9
am: e885ccf0df

Change-Id: I28f7e020e23c629ef303222c3a8489fc6aa541d6
2017-07-01 01:40:45 +00:00
Colin Cross e885ccf0df Merge "Provide make variables for java binaries"
am: 5e19557eb9

Change-Id: Ib1be7da98214e3b6c27867b80005e18cc68a0d33
2017-07-01 01:36:14 +00:00
Colin Cross 0851df8c82 Provide make variables for java binaries
Replace java -> $(JAVA), etc. to prepare for moving java binaries
out of the path and using full paths to them.

Test: builds
Bug: 62956999
Change-Id: I5dfcd0d4e855ecde69cd127169e9545e59723d12
2017-07-01 01:03:14 +00:00
Andreas Gampe 831fc713f8 Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
Add product variable that can override the ART module behavior
packing. Rules and meaning are detailed in art/Android.mk.

Bug: 62087184
Test: m
Change-Id: I88e1cb0925cf62c3951b486a178d4dfc5e888a93
2017-06-30 11:37:38 -07:00
Bowgo Tsai c2fe53bad9 Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev am: 415024dcba
am: cea12fa14d

Change-Id: If481dbdde54417fde541f6b1bd900f614c5e346c
2017-06-30 16:48:10 +00:00
Bowgo Tsai cea12fa14d Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
am: 415024dcba

Change-Id: I5ddfec3ba7bccd028255ae9729b29606ab220cfd
2017-06-30 16:39:41 +00:00
Bowgo Tsai 0556231cae Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" in BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS
instead of INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS. The former setting will
be propogated to `make dist` while the latter is only used for `make`.

Bug: 38454093
Test: `make dist` and check vbmeta.img is being padded.
Merged-In: I929288b218761a4637a2a2ef0679d3ff85c70731
Change-Id: I929288b218761a4637a2a2ef0679d3ff85c70731
(cherry picked from commit 9e95beab31)
2017-07-01 00:34:02 +08:00
Bowgo Tsai 9e95beab31 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" in BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS
instead of INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS. The former setting will
be propogated to `make dist` while the latter is only used for `make`.

Bug: 38454093
Test: `make dist` and check vbmeta.img is being padded.
Change-Id: I929288b218761a4637a2a2ef0679d3ff85c70731
2017-06-30 12:13:15 +08:00
Dimitry Ivanov 7817c2b226 Merge "Add libdl.so to the list of system shared libs" am: b519d002f3 am: cd00be0767 am: b07838c082
am: 181713e34f

Change-Id: Ib3846df71ea350c5c7ef13045070fddd2a83e648
2017-06-29 22:29:36 +00:00
Dimitry Ivanov 181713e34f Merge "Add libdl.so to the list of system shared libs" am: b519d002f3 am: cd00be0767
am: b07838c082

Change-Id: I8a5fc05538b48f8ae086e6d25b30633225f8dfc3
2017-06-29 22:25:07 +00:00
Dimitry Ivanov b07838c082 Merge "Add libdl.so to the list of system shared libs" am: b519d002f3
am: cd00be0767

Change-Id: I994196c311525799c075476520a386d5fa22e2ed
2017-06-29 22:21:06 +00:00
Dimitry Ivanov cd00be0767 Merge "Add libdl.so to the list of system shared libs"
am: b519d002f3

Change-Id: I2d3d5daf26b7a78d68c02cf961bf43a71f19b0bf
2017-06-29 22:17:04 +00:00
Dimitry Ivanov b519d002f3 Merge "Add libdl.so to the list of system shared libs" 2017-06-29 22:12:03 +00:00
Dan Austin 82f6d9405f Merge "Update coverage sanitizer flags in make" am: 846bd7e00d am: dbe39cd069 am: 213d48e682
am: f445e283e2

Change-Id: I3e7f74f22dc6f5355261551d084895ac8aacf80f
2017-06-29 19:13:53 +00:00
Dan Austin f445e283e2 Merge "Update coverage sanitizer flags in make" am: 846bd7e00d am: dbe39cd069
am: 213d48e682

Change-Id: Ib4f92789fde658855600ed129e808531a5b54e55
2017-06-29 19:09:53 +00:00
Dan Austin 213d48e682 Merge "Update coverage sanitizer flags in make" am: 846bd7e00d
am: dbe39cd069

Change-Id: I5df5ea78d06479611e963eb6734085cd39dda7dd
2017-06-29 19:05:52 +00:00
Dan Austin dbe39cd069 Merge "Update coverage sanitizer flags in make"
am: 846bd7e00d

Change-Id: If5b06376ddb67ddecce4162ddeeb4828c35fa47f
2017-06-29 19:02:23 +00:00
Dan Austin 9978b5274c Update coverage sanitizer flags in make
Update the coverage sanitizer flags in make to use the new
flavor of coverage sanitization.

Bug: 63108942

Test: Test fuzzer runs with coverage guards.

Change-Id: I12bda1767b69d0d89557e5f8a91da50b0f137ff3
2017-06-29 08:53:02 -07:00
Howard Chen b83b205265 Add a make maco to convert string to upper case
There's already a to-lower function. Add a to-upper function to make
it complete.

Bug:36012197
Test: `make` pass, flash images from $OUT and boot device with chain
partitions

Change-Id: I39fe8c277a3cf6b87fc3c411eeab2fa5fb40007b
2017-06-29 16:18:47 +08:00
Tao Bao 09a403eb1b Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817 am: ce10b6e2f3 am: 1612f02ff2
am: 47743957f3

Change-Id: Ibdfe63e9a23243f1c14377edd2796cc487cc2359
2017-06-29 03:26:35 +00:00
Tao Bao 47743957f3 Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817 am: ce10b6e2f3
am: 1612f02ff2

Change-Id: If03509584275c1c0fc1f72f44cfb8fbfdfd4125b
2017-06-29 03:22:35 +00:00
Tao Bao 1612f02ff2 Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817
am: ce10b6e2f3

Change-Id: I3b6f7ade42f58baa722e2ee3df81efac48a5b653
2017-06-29 03:19:02 +00:00
Tao Bao ce10b6e2f3 Merge "Allow packing custom radio images into target_files zip."
am: 9ea6a8b817

Change-Id: Ifdcdfa2214e4fa75bb0c7a5df1cb1796814fa7bc
2017-06-29 03:16:17 +00:00
Hung-ying Tyan 3545180d01 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev am: 3b7460eda9
am: 331fd11216

Change-Id: I53b07ed74317bd69343d0b6d5919faf55a65c297
2017-06-28 06:34:36 +00:00
Hung-ying Tyan 331fd11216 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev
am: 3b7460eda9

Change-Id: I8b610498ddae48f93e7d9e23225b7361d4e0f8b7
2017-06-28 06:31:17 +00:00
TreeHugger Robot 3b7460eda9 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev 2017-06-28 06:28:10 +00:00
Dimitry Ivanov cdf3927ec4 Add libdl.so to the list of system shared libs
Note that libdl is already (always) implicitly loaded
because libc.so has a dependency on it.

Also make sure that libc.so always preceding libdl.so
in dt_needed list.

Bug: http://b/62815515
Test: make
Change-Id: I94c9d676b7fa98438b452d24f6c3bbf93166c6a9
2017-06-27 16:05:13 -07:00
Tao Bao 95a95c3a5e Allow packing custom radio images into target_files zip.
Radio images are added to INSTALLED_RADIOIMAGE_TARGET, which by default
will be packed under RADIO/ in a target_files zip. This CL introduces
BOARD_PACK_RADIOIMAGES that allows additionally copying them into
IMAGES/, which will then be included into <product>-img.zip.

Bug: 62195105
Test: Define BOARD_PACK_RADIOIMAGES and `m dist`. Check the generated
      target_files zip and <product>-img.zip.
Change-Id: I3deafd2dfecd1d4dbfdfc2d002fc40ef22fb60ea
2017-06-27 13:50:12 -07:00
Hung-ying Tyan 7eb6a926ad Move /default.prop to /system/etc/prop.default
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.

Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
      of prop.default, verified the symlink, checked a few properties
      (via adb shell getprop) and manually tested a few apps (Camera,
      Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
          -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
          -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
(cherry-picked from 4fbbe4578bb10d54292d9b243edf4999fddf1c93)
2017-06-27 15:10:32 +08:00
Hung-ying Tyan f829b40c48 Move /default.prop to /system/etc/prop.default
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.

Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
      of prop.default, verified the symlink, checked a few properties
      (via adb shell getprop) and manually tested a few apps (Camera,
      Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
          -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
          -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-06-27 15:05:17 +08:00
TreeHugger Robot e356e13113 Merge "Add PRODUCT_SYSTEM_SERVER_DEBUG_INFO property" 2017-06-26 23:27:12 +00:00
Bryan Eyler 960c22b2ec Merge "Re-compute DX command if it changes for PDK." 2017-06-26 22:23:37 +00:00
Mathieu Chartier 94f5f93236 Add PRODUCT_SYSTEM_SERVER_DEBUG_INFO property
Used for specifying if a product should get system server mini debug
info. Defaults to true.

Can be disabled by doing
PRODUCT_SYSTEM_SERVER_DEBUG_INFO := false

The property overrides WITH_DEXPREOPT_DEBUG_INFO, so if
PRODUCT_SYSTEM_SERVER_DEBUG_INFO is true but
WITH_DEXPREOPT_DEBUG_INFO is false, system server will have mini
debug info.

Bug: 62862291
Test: make

Change-Id: I189cd144ce3ade5f02855db022874c8dd45cbdf3
2017-06-26 14:10:53 -07:00
Bryan Eyler af4bde4239 Re-compute DX command if it changes for PDK.
Bug 62360631
Tested build of PDK.

Change-Id: I7cbd649a8a3ce4326e513d5a808b76fbb011d99e
2017-06-26 20:10:28 +00:00
Dan Willemsen de05f89bd3 Enable missing dependency checks
With this enabled, we'll check the entire build graph for missing
dependencies -- even if you don't need to build the module. So it'll
present more errors, but surface them earlier.

These can be turned off manually with an environment variable if the
branch is expected to have missing dependencies:

  ALLOW_MISSING_DEPENDENCIES=true
  SOONG_ALLOW_MISSING_DEPENDENCIES=true   (previous method)

That will be set automatically when using 'mm', which doesn't load the
entire build graph. It will also be set when using 'tapas' to build
unbundled apps, since those are usually on reduced branches.

This provides better error messages when a library is missing:

system/core/init/Android.mk: error: init_tests (NATIVE_TESTS android-arm64) missing libinit (SHARED_LIBRARIES android-arm64)
Available variants:
  libinit (STATIC_LIBRARIES android-arm64)
  libinit (STATIC_LIBRARIES android-arm)
You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build.
system/core/init/Android.mk: error: init_tests (NATIVE_TESTS android-arm) missing libinit (SHARED_LIBRARIES android-arm)
Available variants:
  libinit (STATIC_LIBRARIES android-arm64)
  libinit (STATIC_LIBRARIES android-arm)
You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build.
build/core/main.mk:852: error: exiting from previous errors.

instead of:

ninja: error: 'out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libinit_intermediates/export_includes', needed by 'out/target/product/generic_arm64/obj/NATIVE_TESTS/init_tests_intermediates/import_includes', missing and no known rule to make it

Bug: 37572490
Test: Manually introduce errors, check for expected output
Test: multiproduct_kati, no new breakages
Change-Id: I5847f813045929813214137403c499b44ef67907
2017-06-23 23:39:58 +00:00
Mathieu Chartier c499e0870a Merge "Add product system server compiler filter property" 2017-06-23 22:12:59 +00:00
Colin Cross 56b6d24be6 Merge "Get java config from soong" am: bf215d166b am: 253ffe20e1 am: df973cb239
am: 7a1615fb66

Change-Id: I9c6b8d2998513086734ee730931e6b955f37e35d
2017-06-23 22:07:21 +00:00
Colin Cross 7a1615fb66 Merge "Get java config from soong" am: bf215d166b am: 253ffe20e1
am: df973cb239

Change-Id: I4b6ad0f2f019f7e3804fc55a86db0d0930888f27
2017-06-23 22:02:04 +00:00
Colin Cross df973cb239 Merge "Get java config from soong" am: bf215d166b
am: 253ffe20e1

Change-Id: I4250672ec7cd18a4f82c3e4019a9ec418a17df11
2017-06-23 21:57:03 +00:00
Mathieu Chartier 6a90210c62 Add product system server compiler filter property
The product only needs to specify
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler
filter system server jars are compiled with.

Test: update marlin device
Test: make and look at services.odex

Bug: 62356545

Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb
2017-06-23 13:20:47 -07:00
TreeHugger Robot dacde83555 Merge "Support for android.net.lowpan in frameworks/base" 2017-06-23 06:21:28 +00:00
Dimitry Ivanov 44ed2bc58e Enable linker warning toast for userdebug/eng builds am: 7caea14111
am: a7955c286e

Change-Id: Ia2c0ce8428feb6a3e024f9b78ee6c261bd63d637
2017-06-23 00:39:37 +00:00
Dimitry Ivanov a7955c286e Enable linker warning toast for userdebug/eng builds
am: 7caea14111

Change-Id: I292da7d7d6b9f85a4108e8150a5e032fd5833e0a
2017-06-23 00:35:35 +00:00
Colin Cross b12d4b7ac2 Get java config from soong
Soong will export java config variables.

Test: builds
Change-Id: If185543f8f36a30e7632946c16351d44f012bd6a
2017-06-22 17:21:05 -07:00
Dimitry Ivanov 7caea14111 Enable linker warning toast for userdebug/eng builds
We did not want this to appear for dogfood devices before
because it was noisy, most of popular apps fixed this
problem and it should be much less noisy.

Bug: http://b/62455348
Test: make
Change-Id: Icd28e9ef87f2d1edf456d178741c67ef42670ae1
2017-06-22 14:53:10 -07:00
Jiyong Park 2be7f4a971 Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9 am: 9089f867d4 am: 3487a6127d
am: 2d42f8e81c

Change-Id: Ibc027ba964521c85b30ab01cd914ffc0593b9e24
2017-06-22 05:02:41 +00:00
Jiyong Park 2d42f8e81c Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9 am: 9089f867d4
am: 3487a6127d

Change-Id: I078d76688526881bb77766875f8875a8b0a6696f
2017-06-22 04:59:10 +00:00
Jiyong Park 3487a6127d Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9
am: 9089f867d4

Change-Id: I3966676c72a0bb734da8c71765fc900fcfe85eb9
2017-06-22 04:56:12 +00:00
Treehugger Robot f1610d82f9 Merge "Add LOCAL_OVERRIDES_MODULES" 2017-06-22 04:49:41 +00:00
Chih-hung Hsieh f2997078cd Merge "Add OWNERS in build/make" am: d79ce64555 am: 9af11fce7a am: 877a7a43d2
am: 5b32a83244

Change-Id: I101dc85c69e37214fbb75678a3cc91d6cc57b4ab
2017-06-22 04:41:38 +00:00
Chih-hung Hsieh 5b32a83244 Merge "Add OWNERS in build/make" am: d79ce64555 am: 9af11fce7a
am: 877a7a43d2

Change-Id: I2735fa634707e419da3416fd05ba67ed9c498c57
2017-06-22 04:38:08 +00:00
Chih-hung Hsieh 877a7a43d2 Merge "Add OWNERS in build/make" am: d79ce64555
am: 9af11fce7a

Change-Id: I44e3689a9280de474055ec4f109278ef2ff7d8cf
2017-06-22 04:34:38 +00:00
Chih-hung Hsieh d79ce64555 Merge "Add OWNERS in build/make" 2017-06-22 04:27:13 +00:00
Chris Fries ae3ba6e3aa Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b am: ba0be93555 am: abd4388b4c
am: ec462e6f90

Change-Id: I31bbe964688e4b41b5738fd98330e760b83a27d7
2017-06-21 23:21:43 +00:00
Chris Fries ec462e6f90 Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b am: ba0be93555
am: abd4388b4c

Change-Id: Ife96fb48d2547136559d18ef7412f3939bbdf852
2017-06-21 23:19:13 +00:00
Chris Fries abd4388b4c Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b
am: ba0be93555

Change-Id: I1b6a9b8f05d10738267a51da65bd404242885e6c
2017-06-21 23:16:31 +00:00
Chih-Hung Hsieh 044fc0c4a4 Add OWNERS in build/make
* Owners are selected from top CL approvals or owners.
  They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ibe6765e5448c471ca413413e3d052507ccee4ea6
2017-06-21 16:09:56 -07:00
Chris Fries df0387ddab Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS
.. in order to let the system_other image use it.

Bug: 33203383 Can't build target on mac
Change-Id: Iac2faf0ebdcc933675afbec2301d5d455aa33501
2017-06-21 16:19:35 -05:00
TreeHugger Robot c74abeba1f Merge "Use make functions to convert a text to lower case" into oc-dr1-dev 2017-06-21 16:26:45 +00:00
TreeHugger Robot 680b29e718 Merge "AVB: support chain partition signing" into oc-dr1-dev 2017-06-21 16:26:25 +00:00
Colin Cross 0e9a324644 Merge "Add make sync target" am: 564ce0fa53 am: 5d848ba50a am: 38e8c8bc8c
am: 08447ecb65

Change-Id: I494a4c54fb179537ddd029f08dcc3f24d9e1e736
2017-06-21 03:41:03 +00:00
Dan Willemsen d2a32cf66a Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb am: 616764b247 am: b2f7189479
am: 0e59a32e8f

Change-Id: I64201c181653b4a067988909b802c288ab3a515d
2017-06-21 03:40:44 +00:00
Colin Cross 08447ecb65 Merge "Add make sync target" am: 564ce0fa53 am: 5d848ba50a
am: 38e8c8bc8c

Change-Id: Icb76f4f3aebdc181c29e6ada0e60e138b21d8b5f
2017-06-21 03:06:46 +00:00
Dan Willemsen 0e59a32e8f Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb am: 616764b247
am: b2f7189479

Change-Id: Id6875b2ae03daec9d7b4547fa1c151cb5c12ebb9
2017-06-21 03:06:30 +00:00
Colin Cross 38e8c8bc8c Merge "Add make sync target" am: 564ce0fa53
am: 5d848ba50a

Change-Id: I384460e7373aec904a4779d8af1648f20c004ff8
2017-06-21 03:00:47 +00:00
Dan Willemsen b2f7189479 Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
am: 616764b247

Change-Id: I288d04b2e69c7f231f25905edcff19b31c6cf499
2017-06-21 03:00:30 +00:00
Treehugger Robot 564ce0fa53 Merge "Add make sync target" 2017-06-21 02:42:28 +00:00
Treehugger Robot 5b91bd4ccb Merge "Support custom my_copy_pairs in package-modules.mk" 2017-06-21 02:36:14 +00:00
Bowgo Tsai 6c2d5269e8 Merge "Use make functions to convert a text to lower case" am: cd46f1012e am: 5a7d87afce am: 98e356910f
am: c1ccae5009

Change-Id: I8b3ea0a7751b86f24f70dceb298efaa048781ae3
2017-06-21 02:30:29 +00:00
Bowgo Tsai c1ccae5009 Merge "Use make functions to convert a text to lower case" am: cd46f1012e am: 5a7d87afce
am: 98e356910f

Change-Id: I4b2676842f25f4bc4e59c8be307892f22e53de95
2017-06-21 02:23:58 +00:00
Bowgo Tsai fbcd0412c7 Use make functions to convert a text to lower case
We cannot cache the result of ($shell ...) and we have to run these on
every build even if we don't have to re-read the makefiles. Replace it
with make functions $(substr $(substr ... )).

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Merged-In: I6d4ff8e487931ba25008a2a881401a8951d4049e
Change-Id: I6d4ff8e487931ba25008a2a881401a8951d4049e
(cherry picked from commit e615afd6d0)
2017-06-21 10:22:59 +08:00
Bowgo Tsai f636a80888 AVB: support chain partition signing
Current build system will include AVB metadata from each partition and
store them into /vbmeta partiton when BOARD_AVB_ENABLE is set, which makes
each partition tightly-coupled.

Add the support for 'chain partition':
  - The vbmeta of each partition is stored on the same partition itself.
  - The public key used to verify each partition is stored in /vbmeta.

For example, the following build variables are required to enable chain
partition for system partition:
  - BOARD_AVB_SYSTEM_KEY_PATH := path/to/system_private_key
  - BOARD_AVB_SYSTEM_ALGORITHM := SHA512_RSA8192
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX := 1
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 2

The corresponding settings will be added into META/misc_info.txt for
build_image.py and/or add_img_to_target_files.py:
  - avb_system_key_path=path/to/system_private_key
  - avb_system_algorithm=SHA512_RSA8192
  - avb_system_add_hashtree_footer_args=--rollback_index 1
  - avb_system_rollback_index_location=2

To enable chain partition for other partitions, just replace SYSTEM with
BOOT, VENDOR and/or DTBO in the build variables.

Also switch from  `avbtool make_vbmeta_image --setup_rootfs_from_kernel system.img ...`
to `avbtool add_hashtree_footer --image system.img --setup_as_rootfs_from_kernel...`
when BOARD_BUILD_SYSTEM_ROOT_IMAGE is true. This works for both chained
and no-chained:
  - chained: `avbtool add_hashtree_footer --setup_as_rootfs_from_kernel` will
    add dm-verity kernel cmdline descriptor to system.img
  - no-chained: `avbtool make_vbmeta_image --include_descriptors_from_image
    system.img` will include the kernel cmdline descriptor from system.img into
    vbmeta.img

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device without chain partitions
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device without chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device with chain partitions
Test: follow the same steps in
      https://android-review.googlesource.com/#/c/407572/

Change-Id: I344f79290743d7d47b5e7441b3a21df812a69099
Merged-In: I344f79290743d7d47b5e7441b3a21df812a69099
(cherry picked from commit 3e599ead66)
2017-06-21 10:22:38 +08:00
Bowgo Tsai 98e356910f Merge "Use make functions to convert a text to lower case" am: cd46f1012e
am: 5a7d87afce

Change-Id: I5da050178795dce0333b74ca91a7c18968ea5bd7
2017-06-21 02:18:31 +00:00
Treehugger Robot cd46f1012e Merge "Use make functions to convert a text to lower case" 2017-06-21 01:56:08 +00:00
Yifan Hong 327ebfeffa Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce am: 7dbc8e08ce am: ba5a198625
am: d728b292b1

Change-Id: I61af9549e242feaeb4846ac3f81fe58dbcddd102
2017-06-21 00:58:26 +00:00
Yifan Hong d728b292b1 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce am: 7dbc8e08ce
am: ba5a198625

Change-Id: Iaa40b19c94c425b74a93d64c33bc5aa06f8c2690
2017-06-21 00:53:55 +00:00
Yifan Hong ba5a198625 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce
am: 7dbc8e08ce

Change-Id: I99525848d5e12269351d18e237ea1e3f82967420
2017-06-21 00:49:25 +00:00
Treehugger Robot 3952eef8ce Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" 2017-06-21 00:33:24 +00:00
Colin Cross 91a52277b0 Add make sync target
make sync will build everything necessary to adb sync system
and vendor, without wasting time rebuilding system.img and
vendor.img.

Test: m -j sync
Change-Id: I91c0012eed6d58a338393cc375056a30e2a24b09
2017-06-20 16:57:52 -07:00
Dan Willemsen f354b178b1 Support custom my_copy_pairs in package-modules.mk
To support extra files in package-modules.mk, allow the user to set
my_copy_pairs to a list of src:dest pairs that will be copied into the
zip file.

Test: build-aosp_arm.ninja is identical before/after
Test: codesearch says that these variables aren't otherwise used
Test: set my_copy_pairs, ensure that they exist in the zip.
Change-Id: Ia80cd136db8ad37a71010baf0552621b281c8bc3
2017-06-20 16:00:48 -07:00
Yifan Hong 84cbe4353c LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK
Test: m -j -k BOARD_VNDK_VERSION=true

Bug: 37342627

Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-20 15:42:54 -07:00
Yifan Hong 3ca68183bb LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK
Test: m -j -k BOARD_VNDK_VERSION=true

Bug: 37342627

Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-20 15:42:37 -07:00
Bowgo Tsai e615afd6d0 Use make functions to convert a text to lower case
We cannot cache the result of ($shell ...) and we have to run these on
every build even if we don't have to re-read the makefiles. Replace it
with make functions $(substr $(substr ... )).

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Change-Id: I6d4ff8e487931ba25008a2a881401a8951d4049e
2017-06-20 17:44:00 +08:00
Bowgo Tsai 5bac3d86d6 Merge "AVB: support chain partition signing" am: 0effed4b94 am: dcad0945ab am: abbba2c832
am: f184e3a35b

Change-Id: I3247fe4885984a8e7e9015a9bc2e2ee383b561a1
2017-06-20 07:12:35 +00:00
Bowgo Tsai f184e3a35b Merge "AVB: support chain partition signing" am: 0effed4b94 am: dcad0945ab
am: abbba2c832

Change-Id: I0ffdd31bad14c42afddf8180bf7d1e5e8a0f841d
2017-06-20 07:10:04 +00:00
Bowgo Tsai abbba2c832 Merge "AVB: support chain partition signing" am: 0effed4b94
am: dcad0945ab

Change-Id: I5bc9f2dcc94b2db846d9956c0def6b3c9910b2c5
2017-06-20 07:07:33 +00:00
Treehugger Robot 0effed4b94 Merge "AVB: support chain partition signing" 2017-06-20 06:57:34 +00:00
Robert Quattlebaum ea7956e2da Support for android.net.lowpan in frameworks/base
Bug: b/33073713
(cherry picked from commit b2cbafe06e)

Change-Id: I9ddb52a14d2a2fffb2b8dc924ceb277f9076b19a
2017-06-20 11:01:37 +09:00
Dan Willemsen 0596384adb Mark oc-dev-plus-aosp OPR1 as REL
It contains all of oc-dev, which has OPR1 marked as REL, so we should be
using API 26 instead of 'O'.

Test: Check PLATFORM_VERSION_CODENAME / PLATFORM_SDK_VERSION
Change-Id: I0e8f3b42b8ac60422f0a8b044de45ba03b0bcfcf
Merged-In: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
2017-06-16 15:02:51 -07:00
Mathieu Chartier b8d3cc02cd Allow custom compiler filters for system server jars
Passing down a compiler filter in LOCAL_DEX_PREOPT_FLAGS or
PRODUCT_DEX_PREOPT_DEFAULT_FLAGS will no longer always get
overridden to speed.

Bug: 62356545
Test: make and flash

Change-Id: I8b777c8881cba6b11cda56d27f0a714c92d70d94
2017-06-16 11:41:59 -07:00
Igor Murashkin 5f5daa504e Merge "core: Move core.oat bootjar definitions into envsetup.mk" into oc-dev-plus-aosp
am: caa917ae3d

Change-Id: I312c7e60ef87dc2f400c992754e4093edfe300ee
2017-06-16 03:28:02 +00:00
Igor Murashkin cda3d10e56 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
(cherry picked from commit f33a96c07f)
2017-06-16 03:08:33 +00:00
Treehugger Robot 6cb7688e85 Merge "core: Move core.oat bootjar definitions into envsetup.mk" 2017-06-16 02:06:02 +00:00
Igor Murashkin 9d4639c8c2 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk
to reuse TARGET_CORE_JARS.

The above variables can be used from scripts with get_build_var
from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Merged-In: If12569719343bfbba20c1cda9a5302ab541dbfc6
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
2017-06-16 00:54:47 +00:00
Igor Murashkin f33a96c07f core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
2017-06-15 14:51:36 -07:00
Nicolas Geoffray 8be30c47d7 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev
am: 0081d76597

Change-Id: I81039c2b5d1ae202e4cbca43e98322e15ab5c3e9
2017-06-15 14:42:18 +00:00
Nicolas Geoffray 0081d76597 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev 2017-06-15 14:06:10 +00:00
Nicolas Geoffray 78eec677cc Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667 am: eec5747912 am: 59514d2bae
am: cd2a171764

Change-Id: Ife83a33b8ebec753a5a318113ffd5544ebf2f4a6
2017-06-15 11:54:26 +00:00
Nicolas Geoffray cd2a171764 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667 am: eec5747912
am: 59514d2bae

Change-Id: I27dcc7cd5fca29fea557cb6d681ccfa570b84cb8
2017-06-15 11:51:26 +00:00
Nicolas Geoffray 59514d2bae Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667
am: eec5747912

Change-Id: Iee5490ea2b74137612238282115478b148aed55e
2017-06-15 11:48:26 +00:00
Nicolas Geoffray c3ffeddc59 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build

(cherry picked from commit 4a0ad4ac61)

Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 12:40:15 +01:00
Nicolas Geoffray 8c2c1ed667 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." 2017-06-15 11:38:24 +00:00
Mariano Giardina a9d9cc6499 Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b7b am: cc33b6005f am: 78d9b75329
am: a43852fcdc

Change-Id: I3a5adbb7d5c3b8ec552934d898fbb1c2c41f2cfb
2017-06-15 11:18:23 +00:00
Mariano Giardina a43852fcdc Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b7b am: cc33b6005f
am: 78d9b75329

Change-Id: I1bd6af643810358d4ea8426338607c6f506dad72
2017-06-15 11:15:23 +00:00
Mariano Giardina 78d9b75329 Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b7b
am: cc33b6005f

Change-Id: I2f7465d6bd723c85aa0c028e8e8268d631c13d02
2017-06-15 11:12:23 +00:00
Mariano Giardina 1e14bc3b7b Merge "Revert "core: Move core.oat bootjar definitions into core/config"" 2017-06-15 11:01:29 +00:00
Mariano Giardina 2f137ee118 Revert "core: Move core.oat bootjar definitions into core/config"
This reverts commit 8c50798243.

Possible culprit of breakage in git_master sdk_google_aw_x86:
FAILED: out/target/product/generic_x86/dex_bootjars/system/framework/x86/boot.art 
ex2oatd E 06-15 03:56:00 47990 47990 runtime.cc:1761] Failed to return pre-allocated NoClassDefFoundError
dex2oatd F 06-15 03:56:00 47990 47990 thread.cc:3591] Check failed: new_exception != nullptr 

Testing if Treehugger passes with the rollback before submitting

https://android-build.googleplex.com/builds/submitted/4101897/sdk_google_aw_x86-sdk/latest/view/logs/build_error.log

Change-Id: Iceac31e775eaf3cd5fd9b3d2a17d3af200e35b27
2017-06-15 10:14:51 +00:00
Paul Duffin a9b3b163f1 Merge "Add junit/textui/** to the proguard filter" am: 3b3bffc0d0 am: 5022a346c7 am: b61544dd73
am: e101faa214

Change-Id: I6685669902e80ca9eb22271d5168ac42d0a1ff94
2017-06-15 09:19:16 +00:00
Paul Duffin e101faa214 Merge "Add junit/textui/** to the proguard filter" am: 3b3bffc0d0 am: 5022a346c7
am: b61544dd73

Change-Id: Ia0f9214c51370fa6160652614bc39504e237246b
2017-06-15 09:15:46 +00:00
Paul Duffin b61544dd73 Merge "Add junit/textui/** to the proguard filter" am: 3b3bffc0d0
am: 5022a346c7

Change-Id: I5ba99c3e20a0aeee1c8a6c5bd6119a1615112cb5
2017-06-15 09:12:50 +00:00
Nicolas Geoffray 4a0ad4ac61 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build
Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 09:52:45 +01:00
Yoshisato Yanagisawa d05ca3eefd Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f am: cc2ca23b1e am: 7b691489a8
am: 1cceaef3fc

Change-Id: I10cd3937cd0b6d6810d9795323ff42641cfaf880
2017-06-15 07:45:09 +00:00
Paul Duffin 54747a7f09 Add junit/textui/** to the proguard filter
Fixes build breakage caused by having duplicate versions of
a class in the application and in the API. This workaround will
be removed once junit classes have been removed from the API.

Bug: 30188076
Test: make Browser2 ANDROID_FORCE_JACK_ENABLED=disabled
Change-Id: I9a9031d3ef6d82f35413b229d588a605f9ed39dc
2017-06-15 08:42:23 +01:00
Yoshisato Yanagisawa 1cceaef3fc Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f am: cc2ca23b1e
am: 7b691489a8

Change-Id: I1aad4f8b17853308346d62cf70a54d6503ba9675
2017-06-15 07:42:11 +00:00
Yoshisato Yanagisawa 7b691489a8 Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f
am: cc2ca23b1e

Change-Id: Ie7288bc85507008efeed8bf5a3b42ceb2392062b
2017-06-15 07:38:39 +00:00
Treehugger Robot aa09aa819f Merge "Set JAVAC_WRAPPER if USE_GOMA is set." 2017-06-15 07:28:26 +00:00
Igor Murashkin 740ad1c1d3 Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225 am: db52463bb3 am: 9c57325093
am: ca811c825c

Change-Id: I35818aa6a4193444a3c7dbfc691f33dd9a608f96
2017-06-15 03:22:07 +00:00
Igor Murashkin ca811c825c Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225 am: db52463bb3
am: 9c57325093

Change-Id: If1ec447b21e277a023b016868db1633379acc5e0
2017-06-15 03:19:07 +00:00
Igor Murashkin 9c57325093 Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225
am: db52463bb3

Change-Id: I7fe90df0a8dae2fb5aa9f0dbcfc21a77b2700a87
2017-06-15 03:16:07 +00:00
Igor Murashkin 5e1aa20225 Merge "core: Move core.oat bootjar definitions into core/config" 2017-06-15 03:06:12 +00:00
Igor Murashkin 8c50798243 core: Move core.oat bootjar definitions into core/config
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS to reuse TARGET_CORE_JARS.

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 && make -j32 build-art-host build-art-target
Change-Id: I620e28be41047a1d501d7f144fe415ee4a0af36f
2017-06-14 10:02:09 -07:00
Yoshisato Yanagisawa 4f3e5685fc Set JAVAC_WRAPPER if USE_GOMA is set.
Now, people can also use goma for building javac.  Let me make it by
default.

Test: USE_GOMA=true m -j4
Bug: 62334576
Change-Id: I941ce42dc0f9cbd0dcc00e6fd19368c3af11695f
2017-06-14 07:57:54 +00:00
Bowgo Tsai 6ebcac752f Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev am: 7f0e79b146
am: dd6403d8ff

Change-Id: I5227e50e9bff2b45f6495720d9a5d919769c79ef
2017-06-14 04:24:52 +00:00
Bowgo Tsai dd6403d8ff Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
am: 7f0e79b146

Change-Id: I6c80f285a50facbe1fc44f9a264775206cefcbc1
2017-06-14 04:20:25 +00:00
TreeHugger Robot 7f0e79b146 Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev 2017-06-14 04:13:42 +00:00
Bowgo Tsai e408b4ceb2 Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc
am: e7151a57aa

Change-Id: I0a4dbbe18574e1c2037b185c7e3794033da2c974
2017-06-14 02:14:41 +00:00
Bowgo Tsai 53cf999923 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" when making vbmeta.img.

Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
Merged-In: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
(cherry picked from commit 7cd30041e9)
2017-06-14 10:14:24 +08:00
Hung-ying Tyan d9657ef5be Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev 2017-06-14 02:13:51 +00:00
Treehugger Robot 6b126fb7bc Merge "Align size of vbmeta image to 4k boundary" 2017-06-14 02:01:45 +00:00
Colin Cross 74d69626a9 Master is now OPM1
Remove OPD1 from master.  Also remove the temporary workaround
for b/37208937.

Bug: 37208937
Bug: 38436796
Bug: 62596317
Test: builds
Change-Id: Id4ea864e1d78bb793b2d4a0705673a66a957acdb
2017-06-13 18:04:47 -07:00
Dolly Dhariwal 45e02909d4 Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
am: 6652dd9005

Change-Id: Ibad29c6af59fbf3c53cad5351563a6521f0c29a8
2017-06-13 19:52:46 +00:00
TreeHugger Robot 6652dd9005 Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev 2017-06-13 19:43:02 +00:00
Jeff Vander Stoep 5a41f892b3 Build split file_contexts for recovery am: 4ff042c4aa am: 0b3fc37d7e
am: a0f3fa1640

Change-Id: Ib03aecd648b121baaa7ddd799ef6479a649f6440
2017-06-13 18:07:25 +00:00
Jeff Vander Stoep a0f3fa1640 Build split file_contexts for recovery am: 4ff042c4aa
am: 0b3fc37d7e

Change-Id: Id210835c9fb03355688b8a87f8ceed60945d135b
2017-06-13 18:02:39 +00:00
Jeff Vander Stoep 716b768594 Build split file_contexts for recovery
am: 4ff042c4aa

Change-Id: I9eff1afef9e427c2e97a64b663a029ef33a8ac4a
2017-06-13 18:00:03 +00:00
Jeff Vander Stoep 0b3fc37d7e Build split file_contexts for recovery
am: 4ff042c4aa

Change-Id: If9ff1b6b2ed152333eeb92a83d9bdbbacc431ed2
2017-06-13 17:59:05 +00:00
Dolly Dhariwal d5c0238446 Updating the BUILD_ID to OC-DR1 for oc-dr1-dev branch.
am: 3e7387a34e

Change-Id: I4730e7277cd94e0f7bafa86b6a7aac9607725635
2017-06-13 17:22:37 +00:00
Jeff Vander Stoep 4ff042c4aa Build split file_contexts for recovery
Bug: 62564629
Test: build and flash marlin. Successfully switch between regular
    and recovery modes

Change-Id: I67ae2f59ca1868cfe777de0d4f0c4e3c2d99329d
2017-06-13 15:39:29 +00:00
Dan Willemsen 4d918be03f Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7 am: cf8ac2a820 am: 2bd2a9d630
am: 29c6fa06c9

Change-Id: I1868dd487f0d1a757582580b9e57f20d8a11c758
2017-06-13 15:37:55 +00:00
Dan Willemsen 29c6fa06c9 Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7 am: cf8ac2a820
am: 2bd2a9d630

Change-Id: I9f6ab6d23b44056e1bfac8fbc94f19ab27241366
2017-06-13 15:33:55 +00:00
Dan Willemsen 2bd2a9d630 Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7
am: cf8ac2a820

Change-Id: Ieef27917a409ff8682cb2159341876480b099d4b
2017-06-13 15:29:55 +00:00
Dolly Dhariwal 3e7387a34e Updating the BUILD_ID to OC-DR1 for oc-dr1-dev branch.
Bug: None
Test: Build and flashed AIO device
Change-Id: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
Merged-In: I796d7490f39f817af8f2ec5bea86593182bfcbe2
2017-06-13 15:14:45 +00:00
Hung-ying Tyan a6b68e72b1 Revert "Revert "Move /default.prop to /system/etc/prop.default""
This reverts commit 88c9dddd0f.

Bug: 37815285
Bug: 62525809
Test: Tested with ag/2400523 and ag/2400524. Booted pixel phones,
      checked the location of prop.default, verified the symlink,
      checked a few properties via adb shell and manually tested
      a few apps (Camera, Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
        -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
        -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.

Change-Id: I2ddf287f42360d1a7c7a22f08e7b9e203e7e603a
2017-06-13 21:18:04 +08:00
Bowgo Tsai 3e599ead66 AVB: support chain partition signing
Current build system will include AVB metadata from each partition and
store them into /vbmeta partiton when BOARD_AVB_ENABLE is set, which makes
each partition tightly-coupled.

Add the support for 'chain partition':
  - The vbmeta of each partition is stored on the same partition itself.
  - The public key used to verify each partition is stored in /vbmeta.

For example, the following build variables are required to enable chain
partition for system partition:
  - BOARD_AVB_SYSTEM_KEY_PATH := path/to/system_private_key
  - BOARD_AVB_SYSTEM_ALGORITHM := SHA512_RSA8192
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX := 1
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 2

The corresponding settings will be added into META/misc_info.txt for
build_image.py and/or add_img_to_target_files.py:
  - avb_system_key_path=path/to/system_private_key
  - avb_system_algorithm=SHA512_RSA8192
  - avb_system_add_hashtree_footer_args=--rollback_index 1
  - avb_system_rollback_index_location=2

To enable chain partition for other partitions, just replace SYSTEM with
BOOT, VENDOR and/or DTBO in the build variables.

Also switch from  `avbtool make_vbmeta_image --setup_rootfs_from_kernel system.img ...`
to `avbtool add_hashtree_footer --image system.img --setup_as_rootfs_from_kernel...`
when BOARD_BUILD_SYSTEM_ROOT_IMAGE is true. This works for both chained
and no-chained:
  - chained: `avbtool add_hashtree_footer --setup_as_rootfs_from_kernel` will
    add dm-verity kernel cmdline descriptor to system.img
  - no-chained: `avbtool make_vbmeta_image --include_descriptors_from_image
    system.img` will include the kernel cmdline descriptor from system.img into
    vbmeta.img

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device without chain partitions
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device without chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device with chain partitions
Test: follow the same steps in
      https://android-review.googlesource.com/#/c/407572/

Change-Id: I344f79290743d7d47b5e7441b3a21df812a69099
2017-06-13 17:45:10 +08:00
Dolly Dhariwal 14a9d76026 Updating the BUILD_ID to OC for oc-dev branch.
Bug: None
Test: Build and flashed AIO device
Change-Id: I0c87c33b8fb6cbaf71cdb90ce86097bfb31f4137
Merged-In: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
2017-06-13 06:24:35 +00:00
Bowgo Tsai 7cd30041e9 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" when making vbmeta.img.

Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
2017-06-13 11:31:06 +08:00
Dan Willemsen 6402873d49 Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir
Some of our minimal branches don't have the necessary droiddoc
templates, so don't cause a FindEmulator warning when the template dir
is missing and ALLOW_MISSING_DEPENDENCIES is set. The warnings will soon
be errors.

When the template directory is missing, ensure that the command doesn't
succeed by adding the directory into the dependency list. Passing a
missing directory doesn't cause an error otherwise, it just wouldn't use
the template.

Test: build-aosp_arm64.ninja is identical before and after this change
Test: Move away build/tools/droiddoc/templates-sdk; m -j libcore-docs
Change-Id: I122f3916b6ab348a5a98dcf2520992eda3655e26
2017-06-12 19:31:50 -07:00