Commit graph

18557 commits

Author SHA1 Message Date
Logan Chien
9eb337b2d7 Merge "Strip LOCAL_CHECK_ELF_FILES" am: 87ec538ef1
am: 08b81a84e1

Change-Id: I7cfa59c796f4708ea81c970d57e749be2b489f30
2019-02-14 02:34:51 -08:00
Logan Chien
87ec538ef1 Merge "Strip LOCAL_CHECK_ELF_FILES" 2019-02-14 10:20:28 +00:00
Logan Chien
e87ff2d85f Strip LOCAL_CHECK_ELF_FILES
This commit strips LOCAL_CHECK_ELF_FILES before comparing it with
`false` so that developers can add comments after LOCAL_CHECK_ELF_FILES.
For example:

    LOCAL_CHECK_ELF_FILES := false  # disable checks due to ...

Bug: 119084334
Test: Add some spaces after LOCAL_CHECK_ELF_FILES and run
      CHECK_ELF_FILES=true make check-elf-files
Change-Id: I2bfaff4807aeeea6c7af0b9d7d716742b6764cd0
2019-02-14 14:30:09 +08:00
Jiyong Park
ecc465cd3c Merge "Drop /root when installing symbols" am: 6eeef21b9d
am: 4840c913b3

Change-Id: I4b655b22bf1b5d7bfaad051186a260262ca2b0d3
2019-02-13 21:47:27 -08:00
Allen Hair
8dd24c9337 Merge "Generate API XML files from android stub targets instead of text input." am: 07603d63f6
am: 7de1297db3

Change-Id: Ia96cdfa6d6f12d92c749c136adfac85370fb10a4
2019-02-13 21:46:22 -08:00
Treehugger Robot
6eeef21b9d Merge "Drop /root when installing symbols" 2019-02-14 05:27:44 +00:00
Treehugger Robot
07603d63f6 Merge "Generate API XML files from android stub targets instead of text input." 2019-02-14 05:19:34 +00:00
Yifan Hong
99576a5d38 Merge "DAP: system_as_root can't be true." am: bee89836c7
am: b97fa33969

Change-Id: Ic016a1fb624f9bb2048c2759d542a4f45ba1b3f5
2019-02-13 20:32:22 -08:00
Logan Chien
4129464c5c Merge changes I2f2a7df5,I84ff9f61 am: e083c26a19
am: 8cf536529c

Change-Id: I21c85998565610e3473948144fdf157a7082b829
2019-02-13 20:31:27 -08:00
Treehugger Robot
bee89836c7 Merge "DAP: system_as_root can't be true." 2019-02-14 02:09:20 +00:00
Logan Chien
e083c26a19 Merge changes I2f2a7df5,I84ff9f61
* changes:
  Check ELF files in both paths
  Add system shared libs to a prebuilt_internal.mk path
2019-02-14 01:53:27 +00:00
Allen Hair
191f0e5b60 Generate API XML files from android stub targets instead of text input.
The resulting XMLs will contain more complete information (such as
whether or not a method is native) than is available in current.txt.

Bug: 124335876
Test: make PRODUCT-cf_x86_phone-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true tests

Change-Id: Icb8999bcd6be28f3ec8ff6bffa33b261f0d20606
2019-02-13 17:48:00 -08:00
Pirama Arumuga Nainar
80381f8a06 Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" am: 5aab10f40d
am: f5119676e9

Change-Id: I5b9d563e8656da3137ae9749aaf45ffae6ac9de5
2019-02-13 16:44:54 -08:00
Colin Cross
da37ee584c Merge "Make copy-many-files take an optional destination directory" am: ceaf716a3d
am: e95dc4e3cc

Change-Id: Idc0fee93d1f37ab74ca29fcccc9268140e9c3639
2019-02-13 16:10:16 -08:00
Pirama Arumuga Nainar
5aab10f40d Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" 2019-02-14 00:05:57 +00:00
Yifan Hong
f84c7e5c8f DAP: system_as_root can't be true.
Test: builds
Change-Id: I3e47e9717c983703494abc8417526caf5955d2e4
Fixes: 124274480
2019-02-13 15:08:33 -08:00
Colin Cross
dc53f450af Make copy-many-files take an optional destination directory
Test: m checkbuild
Change-Id: I777952d27bd1a0cf2608e080a0f46e39268784ce
2019-02-13 08:03:25 -08:00
Nicolas Geoffray
7b66ef4a57 Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" am: cd75414f1e
am: 3ac7c3e373

Change-Id: I9e38c739277b4bcd31c13d2e24e45586790201f2
2019-02-13 04:14:42 -08:00
Nicolas Geoffray
cd75414f1e Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" 2019-02-13 11:59:39 +00:00
Anton Hansson
cda7b88b7d Merge "Move dump-products back to the config stage" am: 2582554c42
am: b893eaed97

Change-Id: Ifad27bb8b916a71ad7e81e48324f2fdfa9ffbee1
2019-02-13 01:26:35 -08:00
Anton Hansson
2582554c42 Merge "Move dump-products back to the config stage" 2019-02-13 09:12:30 +00:00
Colin Cross
bccabe6d4b Merge "Move dexpreopt image selection out of dexpreopt_gen" am: 8f4e0f2939
am: 5755b02cfe

Change-Id: I137ba4bf924f2b044f05034893bde9521849b754
2019-02-12 17:20:37 -08:00
Colin Cross
8f4e0f2939 Merge "Move dexpreopt image selection out of dexpreopt_gen" 2019-02-13 01:00:49 +00:00
Bowgo Tsai
140735a1ef Merge "Adding per-partition SPL into AVB prop descriptors" am: cb52058f8f
am: e0b388d5ba

Change-Id: If6ea6e7b3c1df63f5dc096b06305b02ba8c9f86e
2019-02-12 15:49:11 -08:00
Dan Willemsen
5371a6f48f Merge "Obsolete add_lunch_combo" am: 5afd3dc00e
am: cff18343d4

Change-Id: Iffa9289d5065cf8739996caf72ae04433ad94bd2
2019-02-12 15:48:04 -08:00
Treehugger Robot
cb52058f8f Merge "Adding per-partition SPL into AVB prop descriptors" 2019-02-12 23:30:13 +00:00
Treehugger Robot
5afd3dc00e Merge "Obsolete add_lunch_combo" 2019-02-12 23:22:50 +00:00
Tom Cherry
531ef2df70 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H" am: 8bca10ade4
am: 1e29059140

Change-Id: I1d7273bc93d8eab2903ad7478a033902162dd836
2019-02-12 13:42:10 -08:00
Tom Cherry
8bca10ade4 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H" 2019-02-12 21:10:41 +00:00
Steven Laver
c1103c969e Merge "Allow properties to be derived from partition-specific properties" am: 0cf76f544b
am: 4225bbcbbe

Change-Id: I2730b6ecd3197806290e9540d6f2fc3a07f510d2
2019-02-12 08:56:18 -08:00
Steven Laver
0cf76f544b Merge "Allow properties to be derived from partition-specific properties" 2019-02-12 16:44:57 +00:00
Nicolas Geoffray
98f5e86660 Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""
This reverts commit a81dad1bc4.

Test: build && atest android.text.cts.EmojiTest#testEmojiGlyphWebView on Cuttlefish
Change-Id: Ie3c43830fc9a994ed35883abb8ca71d97bd5c44d
2019-02-12 14:00:38 +00:00
Dan Willemsen
5436c7e583 Obsolete add_lunch_combo
Bug: 77599627
Test: source build/envsetup.sh with add_lunch_combo calls in bash & zsh
Change-Id: If12b41d8f9a2f56efdb64ad0dccc25a1e342fdd1
2019-02-11 21:36:25 -08:00
Jeongik Cha
79fd81bef6 Merge "Detect shareduid between different partitions" am: 1b082c3e05
am: 39fa5c4357

Change-Id: Ie1c2c158ecc14f9446810d67b94b305864859376
2019-02-11 17:16:04 -08:00
Treehugger Robot
1b082c3e05 Merge "Detect shareduid between different partitions" 2019-02-12 00:55:08 +00:00
Colin Cross
87378f1888 Move dexpreopt image selection out of dexpreopt_gen
Instead of passing both the module and global dexpreopt image
selection into dexpreopt_gen, determine the correct dexpreopt
image in Make.  This allows the Make dexpreopt rule to only
depend on the necessary boot images, preventing an order-only
dependency on the 32-bit boot image for a 64-bit only module.

Also stop using the boot image "location" as an input, only
track the real path, which will be converted to the "location"
that dex2oat expects when constructing the command line in
dexpreopt_gen.

Removes support for the unused LOCAL_DEX_PREOPT_IMAGE_LOCATION
variable.

Test: m checkbuild
Change-Id: I2e3e1d30fdfed92fb08e6cc1c9515edf8d99c7f0
2019-02-11 15:25:07 -08:00
Steven Laver
9e73e82a12 Allow properties to be derived from partition-specific properties
This change allows ro.product.[brand|device|manufacturer|model|name] and
ro.build.fingerprint to be derived at boot time (and in the OTA
generation scripts) from partition-specific properties.

Test: booted system image, verified properties
Test: booted recovery image, verified properties
Test: unpacked OTA package, verified build fingerprint
Bug: 120123525
Change-Id: Iadd230a0577f35c7c37b0f911e91a5c2863ed1fe
2019-02-11 23:03:00 +00:00
Tom Cherry
e0f3ed5cd0 Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H
TARGET_FS_CONFIG_GEN has existed as the preferred mechanism for two
releases, so we finally deprecate TARGET_ANDROID_FILESYSTEM_CONFIG_H.

Test: build
Change-Id: I299a4d1d1d893ac16d6e6ce2ec4659bfcdc19095
2019-02-11 13:45:01 -08:00
Anton Hansson
dce3f920f2 Move dump-products back to the config stage
It's unnecessary to run all the make file parsing to dump product
configs. Move the dumping to product_config.mk instead, but switch
the output to $(warnings) as stdout is a bit sensitive during
the config stage.

Test: multiproduct_kati -only-config dump-products
Change-Id: I8c7365c9f90ea2bf152b82dfb983bfb0cdcb1697
2019-02-11 21:19:54 +00:00
Colin Cross
fd1452b46b Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system."" am: 05ef66fc0b
am: 18d4ba62d6

Change-Id: Ibd6a208aaa80c8ab92b5ef35c3a93e3037e811a8
2019-02-11 11:49:00 -08:00
Colin Cross
05ef66fc0b Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system."" 2019-02-11 19:31:31 +00:00
Colin Cross
a81dad1bc4 Revert "Never strip and store dex files uncompressed when they are preopted on system."
This reverts commit 9cdc3beb3d.

Reason for revert: b/123436620

Change-Id: I45fa9236e37c3b7e2d44ede62a2701db2bc8a20d
2019-02-11 19:30:39 +00:00
Nicolas Geoffray
44312c00f6 Merge "Never strip and store dex files uncompressed when they are preopted on system." am: f07d63390c
am: b2d2793762

Change-Id: Ibd7094bbe2161b3c4dbfd1bf5da7ea41627ca63d
2019-02-11 02:45:46 -08:00
Nicolas Geoffray
f07d63390c Merge "Never strip and store dex files uncompressed when they are preopted on system." 2019-02-11 10:31:12 +00:00
Jiyong Park
744fd5698f Drop /root when installing symbols
This change fixes a problem that if a module is installed to the root
partition, its symbol file appears at under symbols/root, which is an
non-existing path at runtime. Since the symbol paths should match with
the runtime path, drop /root when installing symbols.

Bug: 123985838
Test: m libc.mountpoint
libc.so is found under symbols/bionic/lib[64]

Change-Id: I38bd226c3ec758d69902f4f288c83f68170c4068
2019-02-11 16:16:18 +09:00
Colin Cross
2197223be0 Merge "Make manifest and APK agree on uncompressed native libs" am: 010df4b471
am: b568c2e15d

Change-Id: I6e68977cefe84d8f531900022e5588c915fc6239
2019-02-08 18:47:09 -08:00
Elisa Pascual Trevino
0018e3f62d Update Security String to 2019-04-05 Bug: 124119313
am: 0b5a344dc3

Change-Id: I9154a76936f71e6e4af6ea8895881727a4d7be07
2019-02-08 18:29:29 -08:00
Treehugger Robot
010df4b471 Merge "Make manifest and APK agree on uncompressed native libs" 2019-02-09 02:25:32 +00:00
Elisa Pascual Trevino
a864f90501 Update Security String to 2019-04-01 Bug: 124119313
am: f9835d9f4d

Change-Id: I943b55e958358583268447a49d03e9c84ad9bae2
2019-02-08 15:10:51 -08:00
Nicolas Geoffray
9cdc3beb3d Never strip and store dex files uncompressed when they are preopted on system.
In order for the runtime module to always be able to compile apps,
make sure we keep a copy of the dex files optimally.

Gated by a product flag if a product doesn't include the module yet.

Test: build
Change-Id: Ia9bba7f6f12f3400078a43d39ba4134cf8818399
2019-02-08 22:45:48 +00:00