Commit Graph

17954 Commits

Author SHA1 Message Date
Treehugger Robot
0e0ef050f9 Merge "Provisionally increase PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION to 23." 2018-09-03 14:14:37 +00:00
Dan Willemsen
efb9460d4c Merge "Switch protoc javastream plugin to using explicit path"
am: 690e1a17a4

Change-Id: I9b30486a0deb0df4b4de269f73d43cb938efdbc4
2018-08-31 18:10:55 -07:00
Dan Willemsen
5771e8cbf1 Switch protoc javastream plugin to using explicit path
The previous PATH=$PATH:out/... logic was incorrect, since the version
in $PATH would override the one out. And now that we're limiting what's
accessible via $PATH, that caused an error.

Instead, ensure that all protoc plugins are specified explicitly with
--plugin, then remove the PATH modification.

Test: cd frameworks/base/cmds/am; mma    (with protoc-gen-javastream in $PATH)
Change-Id: I6690727504f67f84fdc95ed93eabdf3351e5cb0b
2018-08-31 15:59:23 -07:00
Narayan Kamath
ea9fe4787a Merge "Fix misleading comment in version_defaults.mk"
am: 3536f6abe4

Change-Id: Ia9edcffc2b919cae82c0ddbb2130413fa5e63178
2018-08-31 13:05:46 -07:00
Treehugger Robot
3536f6abe4 Merge "Fix misleading comment in version_defaults.mk" 2018-08-31 19:46:25 +00:00
David Brazdil
5cd4083b85 Merge "Encode use of private API in manifest"
am: 89e35e5ca9

Change-Id: I7c88bb06e3245fa2efc27417fbb350b2e4283a5f
2018-08-31 03:24:16 -07:00
David Brazdil
89e35e5ca9 Merge "Encode use of private API in manifest" 2018-08-31 09:59:39 +00:00
android-build-team Robot
8d80a97de4 Version bump to PQ1A.180829.004
Change-Id: I5b2e6f0ef333e7220b9243f4382cc2e925893a44
2018-08-31 04:27:30 +00:00
David Anderson
bd29eade54 Merge "Add super_empty.img to target-files and the update package."
am: b1230b608f

Change-Id: I75e20692f35db9b4171ed5899407af240c958278
2018-08-30 19:00:56 -07:00
Treehugger Robot
b1230b608f Merge "Add super_empty.img to target-files and the update package." 2018-08-31 01:48:10 +00:00
David Anderson
1ef03e2b79 Add super_empty.img to target-files and the update package.
super_empty.img is needed for "fastboot update" to work, as such, it
must be included in the update package. This change adds lpmake
parameters to misc_info.txt for add_img_to_target_files.py, and ensures
that lpmake is packaged with otatools.zip.

The build-superimage-target macro is now split into two functions - one
to generate the device-specific arguments, and another to build the full
command-line for convenience. The former is used to pass arguments
directly to add_img_to_target_files.

Bug: 113524256
Test: make updatepackage builds and includes super_empty.img
      make otatools includes lpmake

Change-Id: I25091c964b036beeea2a8b8f738e2c18937c1eb4
2018-08-30 16:02:23 -07:00
David Brazdil
968c99c6f0 Merge "Adjust build rule for hidden API list generation"
am: 354cc2dde6

Change-Id: I02b8b97a9d63eb2efda3a38496a7e1b2155e1bc2
2018-08-30 11:14:22 -07:00
David Brazdil
354cc2dde6 Merge "Adjust build rule for hidden API list generation" 2018-08-30 17:59:02 +00:00
Nan Zhang
520da0dec3 Merge "Follow minor Jetifier usage change"
am: d74327b7a4

Change-Id: I1ce81edfdd5791c3d40bf06b0b8e876dde83fc66
2018-08-30 08:40:46 -07:00
Nan Zhang
d74327b7a4 Merge "Follow minor Jetifier usage change" 2018-08-30 15:28:46 +00:00
David Brazdil
cf163d38d6 Adjust build rule for hidden API list generation
Associated CL in frameworks/base/ migrates hidden API list generation
logic from Makefile/Bash to Python. Instead of four different build
targets, there is now just one. Adjust definitions.mk accordingly.

Bug: 113278235
Test: m appcompat
Change-Id: I01130729a0f783ff37cb4e942bc9ad179fe24e4e
2018-08-30 13:45:22 +01:00
Tao Bao
e1e829efe1 Map numeric dpi value to density bucket for recovery resources.
When choosing the density for recovery resources, the code used to
handle primary density values only, i.e. mdpi, hdpi, xhdpi, 400dpi,
xxhdpi, 560dpi and xxxhdpi. Unlisted values, such as 500dpi, will be
categorized as xhdpi, but with tiny font size selected for recovery.

This CL improves the handling of numeric dpi values. It allows targets
using numeric values in PRODUCT_AAPT_PREF_CONFIG, and maps that to a
proper density bucket. Targets can still specify the density bucket
directly, which will take priority.

Bug: 111559919
Test: `m -j bootimage` with marlin/sailfish/walleye/taimen respectively.
      Check the chosen density bucket for recovery resources
      (xxxhdpi/xxhdpi/xxhdpi/xxxhdpi).
Test: Set PRODUCT_AAPT_PREF_CONFIG to 279/280/281/500/559/560/640. Check
      the computed bucket and the selected recovery font file.
Change-Id: Ia40fcdec5a2752c08172716bcc622a36a2a83cea
2018-08-29 22:08:37 -07:00
yangbill
f90b734c0c ATest: Change module_name from list to single string.
ATest's original module_name is designed as a single string.
The different type maybe cause some problem when loading module_name
data. Due to it expected it as a list but actually it will be a single
string after mod-info obj handling this data.

Bug: 113317515
Test: atest aapt2_tests
      atest hello_world_test
      atest BluetoothInstrumentationTests
      atest packages/apps/Bluetooth/tests/unit/Android.mk
      atest RunBluetoothRoboTests
      atest com.android.bluetooth
      atest libcore/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
        Multiple tests found:
	  0: libjavacore-unit-tests
          1: jsr166-tests
          2: core-ojtests-public
	  ...
      atest SSLSocketTest # Brings up 2 prompts, one for which file then one for which module
      make -j bit
      bit Settings
      bit hello_world_test
      bit BluetoothInstrumentationTests
      bit RunBluetoothRoboTests (Could not find module, but the same situation
          before applying this patch)


Change-Id: I46a14c675eabd7cebd82562954380a9a769e80b5
2018-08-30 05:06:32 +00:00
android-build-team Robot
29a403c997 Version bump to PQ1A.180829.003
Change-Id: I5db12a96587363a6c6cef92c0105f5d9c75ea4a0
2018-08-30 04:03:07 +00:00
android-build-team Robot
d77732f621 Version bump to PQ1A.180829.002
Change-Id: I52741f1e002b7bb3712d0256c5f8482d97f03ec9
2018-08-29 21:55:13 +00:00
Sasha Smundak
e6c2066b13 Merge "Do not call sort when setting ALL_DEPS.MODULES."
am: acdaa8fbac

Change-Id: Ief13c8c4ce110be86d6b0f47238fa5a23903ecd8
2018-08-29 11:38:59 -07:00
Treehugger Robot
acdaa8fbac Merge "Do not call sort when setting ALL_DEPS.MODULES." 2018-08-29 18:28:41 +00:00
Jeff Gaston
db1fb4d53c Follow minor Jetifier usage change
Also specify output level of error to match master

Bug: 110785706
Test: m -j
Change-Id: I634e09f406727d4f169c3a2862a29cd2206414f7
Merged-In: I634e09f406727d4f169c3a2862a29cd2206414f7
2018-08-29 17:33:29 +00:00
Tom Cherry
dafd7d7b19 Merge "Support a first stage ramdisk via TARGET_RAMDISK_OUT"
am: 04552fed3b

Change-Id: I15deb8f5627d9069578316ecf300865fadc4e57e
2018-08-29 10:13:27 -07:00
Tom Cherry
04552fed3b Merge "Support a first stage ramdisk via TARGET_RAMDISK_OUT" 2018-08-29 17:05:40 +00:00
Anton Hansson
6339cd9e28 Merge "Support app shared libs in /product and /product_services."
am: 8b2b69e956

Change-Id: I8f5de52dfcc4a54e4c44eeba0b791d0340387cd1
2018-08-29 08:21:22 -07:00
Anton Hansson
8b2b69e956 Merge "Support app shared libs in /product and /product_services." 2018-08-29 15:15:51 +00:00
Anton Hansson
bb397b0a0b Support app shared libs in /product and /product_services.
This whitelist controls which partitions support installing an app's
libraries in the partition's lib folder as opposed to embedding
them in the APK itself. Update it to also include /product and
/product_services.

Also add some clarifying comments.

Bug: 111797707
Test: in internal branch
Change-Id: I756af46cc9b718ca669dacc9d25364edddb295f4
2018-08-29 13:42:09 +01:00
Dario Freni
b9919ee419 Merge "Include /product_services software in NOTICE."
am: d909caf397

Change-Id: I43ec18723992a73d3632e0671c55d5bcc32a398c
2018-08-29 02:21:18 -07:00
Dario Freni
d909caf397 Merge "Include /product_services software in NOTICE." 2018-08-29 09:11:44 +00:00
Evgenii Stepanov
ae1a32dbec Merge "Add extra cflags to hwasan targets."
am: ad951c51f8

Change-Id: I6957f09eb9f5ee23f529b2560d951fa0fd6332d9
2018-08-28 17:17:03 -07:00
Treehugger Robot
ad951c51f8 Merge "Add extra cflags to hwasan targets." 2018-08-29 00:00:27 +00:00
Dan Willemsen
afcb35081e Merge "Disable 32-bit Darwin builds"
am: 486653e538

Change-Id: Ia8d8f0da0015172cc8a427f30e163a5c260a0e23
2018-08-28 16:54:36 -07:00
Treehugger Robot
486653e538 Merge "Disable 32-bit Darwin builds" 2018-08-28 23:41:13 +00:00
Evgenii Stepanov
aec1ffc09b Add extra cflags to hwasan targets.
Bug: 112438058
Test: SANITIZE_TARGET=hwaddress
Change-Id: I572cb20369b2e98ab5153f665af60366cb7f7657
2018-08-28 13:52:08 -07:00
Dan Willemsen
1d090fc0ce Disable 32-bit Darwin builds
Mac OSX 10.14 Mojave deprecates 32-bit executables, and the 10.14 SDK
does not successfully link 32-bit files.

Test: Install Xcode 10 beta, `m checkbuild host`
Change-Id: Ifad471fb88ead4bda870f49837d937fb5742f3f6
2018-08-28 13:21:42 -07:00
Tom Cherry
d14b895665 Support a first stage ramdisk via TARGET_RAMDISK_OUT
Support a first stage ramdisk which will include the targets placed
into TARGET_RAMDISK_OUT.  This replaces the existing ramdisk on
existing devices.

All system images are now built to be mounted as the root dir.
Devices with a first stage ramdisk will switch root to the system
partition.

BOARD_BUILD_SYSTEM_ROOT_IMAGE remains and is used to specify if the
system partition is going to be directly used as rootfs without the
ramdisk.

Bug: 79173823
Bug: 79758715
Test: hikey boots, sailfish boots
Test: OTA walleye from P to master
Change-Id: Idbb2dccc6340b0235a4bef03e11e420a9ed154b6
2018-08-28 12:42:41 -07:00
android-build-team Robot
b9dbc5248d Version bump to PQ1A.180824.006
Change-Id: I68b4ac3017d5ca1c2274075102c69d50c1bf051a
2018-08-28 19:21:41 +00:00
Chih-hung Hsieh
062ccf719e Merge "Filter out unknown arguments with clang-tidy.sh."
am: 385ba5c434

Change-Id: Iea9eb86cb253610c26372cf3643f2832093dc7ed
2018-08-28 12:21:26 -07:00
Neil Fuller
77e0f6177e Merge "Add core-simple to the standard boot classpath"
am: ba125933fd

Change-Id: I192950309b893bf1dab07070abaf6f1b41d0527e
2018-08-28 11:27:26 -07:00
Tao Bao
873481aeff Merge "Clean up the rules for making vbmeta.img."
am: 7c417b7fd4

Change-Id: Icdb6acab63a2d0501ceff6507a97de9ac8fab1d7
2018-08-28 11:24:59 -07:00
Chih-hung Hsieh
385ba5c434 Merge "Filter out unknown arguments with clang-tidy.sh." 2018-08-28 18:18:32 +00:00
Neil Fuller
ba125933fd Merge "Add core-simple to the standard boot classpath" 2018-08-28 17:36:55 +00:00
Tao Bao
7c417b7fd4 Merge "Clean up the rules for making vbmeta.img." 2018-08-28 17:21:36 +00:00
Dario Freni
cbca1139e8 Include /product_services software in NOTICE.
Bug: 111179267
Test: flashed a module with NOTICE file on a devices and checked the
Legal information webview.

Change-Id: I6e52dee0ea23f05ea73d7cc747c2db1c1525f4b2
2018-08-28 18:06:39 +01:00
Chih-Hung Hsieh
be5dd2023e Filter out unknown arguments with clang-tidy.sh.
* Call clang-tidy.sh defined in PATH_TO_CLANG_TIDY_SHELL.
* Add dependency to clang-tidy and clang-tidy.sh.

Bug: 110538415
Test: build with WITH_TIDY=1
Change-Id: I90175ea1489272d8d4fc0f9ba4e5bbfdc7399d82
2018-08-28 09:45:39 -07:00
Anton Hansson
5712de6d40 Merge "Add substitution for product_services and odm."
am: 72ba8ee16f

Change-Id: I5ea5578afcdaea3c1732f09c59a91104038bcbe4
2018-08-28 09:22:53 -07:00
Neil Fuller
221d82263c Merge "Remove out-of-date comment / logic"
am: 374c14decf

Change-Id: I988b6261a18cb7de837ce84d8dd2c3206e408f17
2018-08-28 09:22:17 -07:00
Anton Hansson
72ba8ee16f Merge "Add substitution for product_services and odm." 2018-08-28 16:06:17 +00:00
Neil Fuller
374c14decf Merge "Remove out-of-date comment / logic" 2018-08-28 16:00:09 +00:00