Commit graph

39562 commits

Author SHA1 Message Date
Treehugger Robot
4ec7972785 Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts" 2017-10-06 00:02:35 +00:00
Colin Cross
d7b99409ce Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set
Bug: 62123342
Test: m -j EXPRIMENTAL_USE_OPENJDK9=1.8 checkbuild
Change-Id: I8be331c422412d6416d92184a2eba093f27fc0fb
2017-10-05 16:47:54 -07:00
Jeff Vander Stoep
10c69455c0 Remove world writable sysfs files
Test: build
Change-Id: I8c4b705726af8629413c5563c2cdba07d9815661
Merged-In: I9d18d31a9a65f785cf4bc69f011990e9f8182228
2017-10-05 15:38:40 -07:00
Dan Willemsen
e3c99016f9 Always pass --auto-add-overlay to aapt2 for aar prebuilts
Bug: 64723465
Test: Build all aar prebuilts in our internal tree
Change-Id: I82ef8d59d4f710b755226b2801dc65c2ccffe40c
2017-10-05 14:55:11 -07:00
Jeff Vander Stoep
381f4ea490 sepolicy: add owners file
Test: build
Change-Id: Ic11f283d3d1eeb2fec8b4745d7c0bc647cb7e717
2017-10-05 14:52:12 -07:00
Jeff Vander Stoep
81c1214675 Merge "Remove sysfs_writable type"
am: f68eea331d  -s ours

Change-Id: I539825e618a5d838202bfa5107dadd0488d33166
2017-10-05 21:22:56 +00:00
Jeff Vander Stoep
f0254bafda Merge "allow setting opengles property"
am: 4feec6ddb8  -s ours

Change-Id: I67c2a9060e8545b13ced8a40c373bae7dda665d0
2017-10-05 18:41:30 +00:00
Treehugger Robot
f68eea331d Merge "Remove sysfs_writable type" 2017-10-05 17:36:29 +00:00
Treehugger Robot
4feec6ddb8 Merge "allow setting opengles property" 2017-10-05 17:36:25 +00:00
Alan Leung
5f1417897c Merge "Add USE_D8_BY_DEFAULT in makefile."
am: 03e8fb10d1

Change-Id: I68ba9afe7406fe84ddb9b5d18e583b89d0b8ccd8
2017-10-05 09:20:21 +00:00
Treehugger Robot
03e8fb10d1 Merge "Add USE_D8_BY_DEFAULT in makefile." 2017-10-05 09:14:44 +00:00
Jeff Vander Stoep
0ce25ee468 Remove sysfs_writable type
It's not used.

Test: build and boot aosp_x86 emulator. No selinux denials.
Change-Id: Ibfc8bfc4f930bac006c86cc05009dc96e78bcf48
2017-10-04 16:43:13 -07:00
Jeff Vander Stoep
178d04e39c allow setting opengles property
Addresses:
avc:  denied  { set } for property=ro.opengles.version
scontext=u:r:qemu_props:s0 tcontext=u:object_r:opengles_prop:s0
tclass=property_service

Test: build
Change-Id: Ia7445344726b941ad153a126dfe66df4bc8536ab
2017-10-04 16:12:36 -07:00
Torne (Richard Coles)
0091bae1ad Don't add empty entry to PATH.
When ANDROID_TOOLCHAIN_2ND_ARCH is unset (all arches except ARM64) the
PATH was being extended with an empty entry, which is interpreted as the
current directory (rarely desirable).

Test: lunch aosp_arm-eng; echo $PATH; lunch aosp_arm64-eng; echo $PATH
Change-Id: I31661241c10b06165dcf555c8b3e799fe54cc0dc
2017-10-04 12:58:30 -04:00
Jiyong Park
03eb06150b Don't reserve size for bad blocks when checking image size
When checking *.img size with the partition size, the build system
reserves additional bits for spare bits and spare bad blocks.

However, for emmc and ufs, the space bits and blocks are entirely
managed by the underlying controller and thus not visible from outside
of the controller. In fact the check routine was made for legacy MTD
storages where raw flash blocks are directly exposed.

This makes the size checking a little bit conservative in modern devices.
Builds were failed even though the *.img can actually fit into the
partition. To handle this problem, the additional size is no longer
reserved when checking *.img size with the partition size.

This change also removes following build flags that are meaningful
only for devices having MTD storages:
BOARD_NAND_PAGE_SIZE
BOARD_NAND_SPARE_SIZE
Further use of them breaks the build

Bug: 35790399
Bug: 66399382
Test: build

Merged-In: I954bf261441b53844e75d05788866f1692a2ad43
Change-Id: I954bf261441b53844e75d05788866f1692a2ad43
2017-10-04 21:25:08 +09:00
Colin Cross
9f92348ffa Merge "Revert "Generate the NDK docs with the ndk-docs target.""
am: b33250278b

Change-Id: I96b3d752fd0ad9b2deb438fbdd677a17619e0540
2017-10-04 00:21:57 +00:00
Alan Leung
013a37b760 Add USE_D8_BY_DEFAULT in makefile.
Bug: 65854021
Test: m USE_D8=true  showcommands out/target/common/obj/JAVA_LIBRARIES/okhttp_intermediates/with-local/classes.dex
Change-Id: Iec1a05bf6f03cf856faf2e013fa169e1a0beaf7a
2017-10-03 17:15:01 -07:00
Colin Cross
b33250278b Merge "Revert "Generate the NDK docs with the ndk-docs target."" 2017-10-04 00:13:54 +00:00
Colin Cross
c294f55489 Revert "Generate the NDK docs with the ndk-docs target."
This reverts commit d51b6d0d75.

Reason for revert: Broke all unbundled builds

Change-Id: Id6722a076ee91ca150b1a53935632579c6f6f6dd
2017-10-04 00:13:00 +00:00
Chih-Hung Hsieh
7dba41687e Merge "Use -Werror in build/make"
am: 2d1681c804

Change-Id: If94e0a0210c7e47880729ad18b7a24e26be4d597
2017-10-03 22:47:22 +00:00
Dan Willemsen
c4c502e751 Merge "Ignore zip comments in dump-package-stats"
am: 75cc5bf9ae

Change-Id: If9f2fa10f24aa90234bd01bdd00177308d80aa9e
2017-10-03 22:40:09 +00:00
Dan Albert
e0af1859b8 Merge "Generate the NDK docs with the ndk-docs target."
am: 0f47dd4c13

Change-Id: I8631da79f3ba45b46be7d0d50fdb48a0b623d141
2017-10-03 22:39:00 +00:00
Treehugger Robot
2d1681c804 Merge "Use -Werror in build/make" 2017-10-03 22:38:24 +00:00
Dan Willemsen
75cc5bf9ae Merge "Ignore zip comments in dump-package-stats" 2017-10-03 22:29:18 +00:00
Treehugger Robot
0f47dd4c13 Merge "Generate the NDK docs with the ndk-docs target." 2017-10-03 22:11:17 +00:00
Chih-Hung Hsieh
2a5bc9dfbf Use -Werror in build/make
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Iced5bb903902f49d7cd5cf5f572906a512c75e18
2017-10-03 13:53:13 -07:00
Dan Albert
d51b6d0d75 Generate the NDK docs with the ndk-docs target.
Test: make ndk-docs
Bug: None
Change-Id: I846f18c2d466d18603bb3ba59aaed7a9c938b1e3
2017-10-03 13:08:25 -07:00
Dan Willemsen
093075304b Ignore zip comments in dump-package-stats
Use -q to silence zip comments, which also silences the first line.

Bug: 67345114
Test: find vendor -name '*.apk' | xargs build/tools/dump-package-stats
Change-Id: Icb319c603de7c29644c58520213940179f67b7e4
2017-10-03 12:56:09 -07:00
Colin Cross
df0e3a3663 Merge "Delete jack support"
am: b039cf792f  -s ours

Change-Id: I118793b51630a987b96f9d94596554bab8cf206e
2017-10-03 01:26:04 +00:00
Treehugger Robot
b039cf792f Merge "Delete jack support" 2017-10-03 01:17:25 +00:00
Dan Willemsen
cd82b18c8d Merge "Fix incremental aapt builds"
am: 26cf972f50

Change-Id: I7279d4662553a6f31ff2e4ff7d5a482972a2acfb
2017-10-02 23:28:43 +00:00
Treehugger Robot
26cf972f50 Merge "Fix incremental aapt builds" 2017-10-02 23:22:28 +00:00
Dan Willemsen
f439c334da Fix incremental aapt builds
If a resource was moved / removed without any other timestamp updates,
ninja would not re-run aapt. To fix this, add a list of resource files
into the same command as aapt (echo ... >/dev/null). That way if the
list changes, ninja will recognize the command line changing and rerun
aapt.

Bug: 67315436
Test: mmma cts/tests/autofillservice
Test: mv cts/tests/autofillservice/res/layout/welcome_activity.xml \
      cts/tests/autofillservice/res/layout/welcome_activity_test.xml
Test: mmma cts/tests/autofillservice

Change-Id: Ia93ac4ff48910fed74a1f1539ce4e1f5a9db023f
2017-10-02 14:22:02 -07:00
Dan Willemsen
cd4d0d4cc3 Merge changes I7b2fc184,I71f6fcaf
am: ea655a138f

Change-Id: Icd7c2390a0a35777bda0a93af534d6a4254fff9b
2017-10-02 20:46:14 +00:00
Dan Willemsen
ea655a138f Merge changes I7b2fc184,I71f6fcaf
* changes:
  Move generated aidl/logtags java classes to a subfolder
  Fix multiple output file generation for AAPT2
2017-10-02 19:54:15 +00:00
Colin Cross
e673deb280 Delete jack support
Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d73)
2017-10-02 11:15:19 -07:00
Colin Cross
a6bc3a8a4c Delete jack support
Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d73)
2017-10-02 18:06:56 +00:00
Dan Willemsen
4d99527dcd Move generated aidl/logtags java classes to a subfolder
So that they can't be generated into src/, which would be added to the
source list automatically.

Bug: 36698184
Test: m telephony-common without this change, pass
Test: m telephony-common without the cleanspec, fail with dup class
Test: m telephony-common with the cleanspec, pass
Change-Id: I7b2fc1847d52ff4a9ba8c69e76123fe152629ef8
2017-09-29 20:36:50 -07:00
Dan Willemsen
ba9b0fbc05 Fix multiple output file generation for AAPT2
Make R.stamp actually part of the same rule that creates R.java.
Otherwise if the generated sources directory is removed, we don't
regenerate R.java / Manifest.java.

Also move the package-export.apk and proguard options file into the same
rule.

Test: m telephony-common; rm out/target/common/obj/*/*_intermediates/src; m telephony-common
Change-Id: I71f6fcaf20593ca23271d52d15537aaa9ef4cc77
2017-09-29 20:35:32 -07:00
Colin Cross
bf7020608f Merge "Respect LOCAL_MIN_SDK_VERSION for dx"
am: a426e0e974

Change-Id: I2a4d370f7788365d5f87dc58490e4979363b6a5e
2017-09-29 20:17:59 +00:00
Treehugger Robot
a426e0e974 Merge "Respect LOCAL_MIN_SDK_VERSION for dx" 2017-09-29 20:13:08 +00:00
Tao Bao
815b445c14 Merge "Use computed salt for AVB-signed images."
am: 4655de40c1

Change-Id: Ifd379a8b90b09ea40f56d15e65c17545024d76dc
2017-09-29 19:53:46 +00:00
Treehugger Robot
4655de40c1 Merge "Use computed salt for AVB-signed images." 2017-09-29 19:44:03 +00:00
Tao Bao
2b6dfd6689 Use computed salt for AVB-signed images.
We want the generated images being identical for the same source files.
Currently the generated ext4 image (either from make_ext4fs or mke2fs)
is reproducible, but the AVB footer added by avbtool contain changes
because of the random salt being used.

This CL changes the avbtool invocation to specify "--salt <hexstring>"
(already supported by avbtool) to use reproducible salt that's computed
based on fingerprints (or thumbprints if applicable).

Bug: 67023482
Test: Regenerate images from the same source as follows:
  Use a target_files.zip from an AVB-enabled target.
    $ zip -d target_files.zip IMAGES/\*
    $ ./build/make/tools/releasetools/add_img_to_target_files.py \
          -v target_files.zip
  Repeat the above commands and compare the generated images.
Change-Id: Id9db17ae0132ca3a820b4be5a5ef06ca3fef71ed
(cherry picked from commit 8f05cca1d9)
2017-09-29 10:47:40 -07:00
SzuWei Lin
0ab6b24e07 resolve merge conflicts of 40ef25d7bd to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I39cf0099b857d38222a81c7be41ec13cebb1fb7a
2017-09-29 15:51:45 +08:00
Treehugger Robot
40ef25d7bd Merge "Apply vndk_package to generic system image" 2017-09-29 06:35:50 +00:00
Colin Cross
9deb331f20 Respect LOCAL_MIN_SDK_VERSION for dx
Follow Jack's behavior for now and pass LOCAL_MIN_SDK_VERSION to
dx.  Don't pass it to desugar for now, desugar with low
--min_sdk_version numbers enables features we haven't verified
yet, and existing apps won't be using the new language features
that require extra desugaring.

Test: examine classes.dex from an app with LOCAL_MIN_SDK_VERSION
Change-Id: Ic7d679b1b11fba98a33418a4f79d4762a91f1f9c
2017-09-28 21:40:35 -07:00
Mathieu Chartier
e3196ada4c Merge "Update paths for frameworks/base/config"
am: e984c78faf

Change-Id: I44a5cb37d1d05a3b7619e04e661f9cca8d9b3fde
2017-09-29 00:20:46 +00:00
Mathieu Chartier
e984c78faf Merge "Update paths for frameworks/base/config" 2017-09-28 23:43:46 +00:00
Mathieu Chartier
d83a7f1fdb Update paths for frameworks/base/config
Bug: 64259751
Test: make

(cherry picked from commit 37ba2d97df)

Change-Id: Iac1f92d1e4126d088b691c46a0b858e9e9bfb1a4
Merged-In: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-09-28 17:54:20 +00:00