Commit Graph

39370 Commits

Author SHA1 Message Date
Dan Willemsen c624182c0c Merge "Ignore zip comments in dump-package-stats" am: 75cc5bf9ae
am: c4c502e751

Change-Id: I2dde44c9d68994e9079f3e8d8b3630195dba1c48
2017-10-03 22:43:55 +00:00
Dan Albert 68392e230e Merge "Generate the NDK docs with the ndk-docs target." am: 0f47dd4c13
am: e0af1859b8

Change-Id: Id314d6248152d865d0bd7fdeb779a8fb930fd052
2017-10-03 22:42:58 +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
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
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 0a9245c78f Merge "Delete jack support" am: b039cf792f -s ours
am: df0e3a3663

Change-Id: Idefb56bcfb8073abf44ec48f3f69f60a70be1550
2017-10-03 01:38:42 +00: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 9461ca528b Merge "Fix incremental aapt builds" am: 26cf972f50
am: cd82b18c8d

Change-Id: I9c57501ace6d643d45239c0b797db747b531d949
2017-10-02 23:30:38 +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 6da385ffe4 Merge changes I7b2fc184,I71f6fcaf am: ea655a138f
am: cd4d0d4cc3

Change-Id: I36823ac57cadb6f2036262ff277cc275999c17ec
2017-10-02 20:53:45 +00: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 37bf2b1250 Delete jack support
am: a6bc3a8a4c

Change-Id: Ie8353581a40916a1f267be9127f0fe2603119f34
2017-10-02 19:47:22 +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 01b57501d8 Merge "Respect LOCAL_MIN_SDK_VERSION for dx" am: a426e0e974
am: bf7020608f

Change-Id: Ie10689985b6fe591391ec693e2da1bb07aff3c4b
2017-09-29 20:19:51 +00: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 431b213f70 Merge "Use computed salt for AVB-signed images." am: 4655de40c1
am: 815b445c14

Change-Id: I66595bd6b306806052559960c12e6f70d30cb8de
2017-09-29 19:56:57 +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 eaba5765cc resolve merge conflicts of 40ef25d7bd to stage-aosp-master
am: 0ab6b24e07

Change-Id: Ie811ebe6b5af696681cd8522d83280ef414eaef2
2017-09-29 10:07:57 +00:00
Mathieu Chartier 2cbb80d5b4 Merge "Update paths for frameworks/base/config" am: e984c78faf
am: e3196ada4c

Change-Id: I75c6489adc15dcb819e1a8034f0764cdc49019d3
2017-09-29 08:21:21 +00: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
SzuWei Lin e5c62213c5 Apply vndk_package to generic system image
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.

Bug: 64654641
Bug: 65614701
Test: build pass
Change-Id: I8d8a02d88604d4287a519b698328a50dc11d819d
2017-09-28 15:26:44 +08:00
Colin Cross 657f61bdd7 Merge "Disable jack completely" am: 480ee2e58c
am: 56294539dc

Change-Id: I1865e45dcd36afe1874564b743eb4891dcc68ceb
2017-09-28 00:45:31 +00:00
Colin Cross 56294539dc Merge "Disable jack completely"
am: 480ee2e58c

Change-Id: I72f0d856228dc5b68e5f581802d5a64f9c814255
2017-09-28 00:40:05 +00:00
Treehugger Robot 480ee2e58c Merge "Disable jack completely" 2017-09-28 00:34:50 +00:00
Dan Willemsen de4a1fc424 Merge "Add CleanSpec.mk entries for linux -> linux_glibc" am: 9ce6d963f2
am: 2e21024c86

Change-Id: Icff46b8a4076e2e502df92864a50b3434776187b
2017-09-28 00:06:12 +00:00
Dan Willemsen 2e21024c86 Merge "Add CleanSpec.mk entries for linux -> linux_glibc"
am: 9ce6d963f2

Change-Id: I3a8800c696a0b1fb50fa421c0283bbb88e3eb619
2017-09-28 00:02:06 +00:00
Treehugger Robot 9ce6d963f2 Merge "Add CleanSpec.mk entries for linux -> linux_glibc" 2017-09-27 23:57:37 +00:00
Dan Willemsen 74616d7802 Add CleanSpec.mk entries for linux -> linux_glibc
Soong renamed intermediate directories from linux_(common|x86|x86_64)...
to linux_glibc_(common|x86|x86_64)..., so remove the old versions to
save space.

Test: Check for old intermediates after applying and running cleanspec
Change-Id: I73ff39014491826224535e1d45c2215669fd19a2
2017-09-27 15:08:27 -07:00
Colin Cross 6684528a6d Disable jack completely
Always set ANDROID_COMPILE_WITH_JACK=false.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I98dfdca27b4338048d50e016a79fbf4e3d86a020
2017-09-27 13:17:59 -07:00
Dan Willemsen 6997a8e62e Merge "Add -lm to the default libs for Linux & Darwin" am: 5118763940
am: c8e3f1e0d8

Change-Id: I83c82da031c02e38b96a97b0b23cf1dff0a57d4e
2017-09-27 07:17:23 +00:00
Dan Willemsen c8e3f1e0d8 Merge "Add -lm to the default libs for Linux & Darwin"
am: 5118763940

Change-Id: I8685d42c742db41d186176346254833249cd0d59
2017-09-27 07:13:58 +00:00
Treehugger Robot 5118763940 Merge "Add -lm to the default libs for Linux & Darwin" 2017-09-27 07:08:57 +00:00