Jiyong Park
f4cbc615fd
Remove duplicated sources that go into hiddenapi-mappins am: 0323b4d8a3
...
am: 96b6abd66a
2019-08-24 01:59:42 -07:00
Pengquan Meng
ea52bc13ea
Merge "Add fileds to Cellbroadcast" am: 071936e546 am: e5f84f5a70
...
am: 33f79cdfc2
2019-08-24 01:51:49 -07:00
Mathieu Chartier
9d5b85a5ec
Merge "Add phenotype property for enabling profiling of boot class path" am: eb247e7abf am: d5f1fed45f
...
am: fb1e55116c
2019-08-24 01:48:15 -07:00
Jiyong Park
28bde2ffbb
Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master am: b7162b936f
...
am: 5db24005a6
2019-08-24 01:46:42 -07:00
Xin Li
bf397e95fd
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master am: abaa7ead61 -s ours
...
am: 6fbf8171af
2019-08-24 01:41:17 -07:00
Jiyong Park
96b6abd66a
Remove duplicated sources that go into hiddenapi-mappins
...
am: 0323b4d8a3
2019-08-24 01:14:15 -07:00
Jiyong Park
0323b4d8a3
Remove duplicated sources that go into hiddenapi-mappins
...
framework-srcs are already coming from metalava-api-stubs-default (via
framework-minus-apex). We don't need to give framework-srcs again.
Test: choosecombo into sdk_phone_arm7
Test: m
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/api-versions.xml
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/dex-mapping.txt
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/hiddenapi-mappings-stubs.srcjar
out/soong/.intermediates/frameworks/base/hiddenapi-mappings/android_common/hiddenapi-mappings_annotations.zip
is successful
Exempt-From-Owner-Approval: Approved internally
Merged-In: I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2
(cherry picked from commit 68020f8f63
2019-08-24 06:28:36 +00:00
Pengquan Meng
33f79cdfc2
Merge "Add fileds to Cellbroadcast" am: 071936e546
...
am: e5f84f5a70
2019-08-23 22:39:23 -07:00
Mathieu Chartier
fb1e55116c
Merge "Add phenotype property for enabling profiling of boot class path" am: eb247e7abf
...
am: d5f1fed45f
2019-08-23 22:34:34 -07:00
Jiyong Park
5db24005a6
Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master
...
am: b7162b936f
2019-08-23 22:26:16 -07:00
Xin Li
6fbf8171af
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master
...
am: abaa7ead61
2019-08-23 22:00:19 -07:00
Xin Li
db21ccd28a
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: bf9040d4f9 -s ours
...
am: 377c17d1ea
2019-08-23 21:22:03 -07:00
Pengquan Meng
e5f84f5a70
Merge "Add fileds to Cellbroadcast"
...
am: 071936e546
2019-08-23 21:20:47 -07:00
Yi Kong
db8ab235e2
[automerger skipped] Fix android-cloexec-pipe clang-tidy warning am: 9b00f181da -s ours
...
am: 62e3c163011fa946a2f2
2019-08-23 21:19:01 -07:00
Xin Li
377c17d1ea
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
am: bf9040d4f9
2019-08-23 20:35:13 -07:00
Yi Kong
62e3c16301
[automerger skipped] Fix android-cloexec-pipe clang-tidy warning
...
am: 9b00f181da1fa946a2f2
2019-08-23 20:26:22 -07:00
Mathieu Chartier
d5f1fed45f
Merge "Add phenotype property for enabling profiling of boot class path"
...
am: eb247e7abf
2019-08-23 20:02:00 -07:00
TreeHugger Robot
b7162b936f
Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master
2019-08-24 00:05:34 +00:00
Jiyong Park
7e1339e055
Use filegroup to simplify Android.bp for frameworks and its friends
...
Java and AIDL source files under frameworks/base are now modularized
using filegroup. Each filegroup has 'path' property set to the base
directory of the ssource files. This allows us to not rely on
aidl.[local_]include_dirs and srcs_lib_whitelist_dirs to get the base
directories.
Bug: 70046217
Test: m
Exempt-From-Owner-Approval: Approved internally
Merged-In: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
(cherry picked from commit b360931bf0
2019-08-24 00:04:18 +00:00
Pengquan Meng
071936e546
Merge "Add fileds to Cellbroadcast"
2019-08-23 23:40:29 +00:00
TreeHugger Robot
abaa7ead61
Merge "DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history" into stage-aosp-master
2019-08-23 20:27:17 +00:00
Mathieu Chartier
eb247e7abf
Merge "Add phenotype property for enabling profiling of boot class path"
2019-08-23 20:23:23 +00:00
Yi Kong
9b00f181da
Fix android-cloexec-pipe clang-tidy warning
...
The upcoming clang-tidy update finds a new instance of
android-cloexec-pipe warning:
FileUtilsTests.cpp:72:13: error: prefer pipe2() with O_CLOEXEC to avoid leaking file descriptors to child processes
ASSERT_EQ(pipe(pipefd), 0);
^~~~~~~~~~~~
pipe2(pipefd, O_CLOEXEC)
Apply the suggested fix by clang-tidy.
Test: build
Bug: 131328001
Exempt-From-Owner-Approval: Cherrypick
Change-Id: Iee772b5c3ed5e2af481e479dab19030f8419290a
Merged-In: Iee772b5c3ed5e2af481e479dab19030f8419290a
(cherry picked from commit f61e2167d51fa946a2f2
2019-08-23 16:46:05 +00:00
Roshan Pius
50d95f3217
Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp
...
am: 9f480e0b8a
2019-08-23 08:58:11 -07:00
Xin Li
bf9040d4f9
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
Bug: 139893257
Change-Id: I43a40bdec58806d2238cb937203d4fa67b8f001d
2019-08-23 15:42:26 +00:00
Roshan Pius
9f480e0b8a
Merge "NetworkStackClient: Refactor network stack process interaction" into qt-dev-plus-aosp
2019-08-23 15:31:17 +00:00
Jared Henderson
37f8b552d3
Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654
...
am: b2cfc86e8b
2019-08-23 03:58:31 -07:00
Anna Trostanetski
6f5669ed78
Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92
...
am: 9b42b7095d
2019-08-23 03:53:09 -07:00
Jay Patel
77c749611d
Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d
...
am: 4088527e0c
2019-08-23 03:47:32 -07:00
Da Xing
2476002005
[automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours am: 392130fee5 -s ours
...
am: ec2c5c2e18
2019-08-23 03:40:48 -07:00
Jared Henderson
b2cfc86e8b
Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef
...
am: 7f1e92a654
2019-08-23 03:40:37 -07:00
Anna Trostanetski
9b42b7095d
Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d
...
am: a105206a92
2019-08-23 03:29:31 -07:00
Jack Yu
3dba92b05c
[automerger skipped] Merge changes from topic "null_callback" am: 5ce391b313 am: 54e83aca93
...
am: e0afc80afb09ef1cb126
2019-08-23 03:27:17 -07:00
Jack Yu
1cf83928e5
[automerger skipped] Added debug messages and watchdog am: 594931f5d9 am: 75db0a70dd
...
am: 966c2eb20d36e2bfbaad
2019-08-23 03:26:57 -07:00
Jay Patel
4088527e0c
Merge "Fix AVR compatibility." am: 9e4df4985a
...
am: babd85e24d
2019-08-23 03:25:18 -07:00
Pengquan Meng
8f843170a4
Merge "Add geo targeting implementation" am: df2293f68b am: 52cd1fe0f1
...
am: 13e58d2ed5
2019-08-23 03:22:35 -07:00
Da Xing
ec2c5c2e18
[automerger skipped] Merge "DO NOT MERGE Crash app on foreground service notification error." am: 2eb5d0c183 -s ours
...
am: 392130fee5
2019-08-23 03:20:40 -07:00
Nagaraja
e83d4f6c7d
Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447
...
am: 40efe816dd
2019-08-23 03:18:47 -07:00
Anna Trostanetski
884ef46cdc
Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb
...
am: 20f25166c3
2019-08-23 03:15:57 -07:00
Jared Henderson
7f1e92a654
Merge "Update Xbox BT controller mapping to support upcoming controller firmware update"
...
am: 87700db4ef
2019-08-23 03:15:53 -07:00
Tobias Thierer
bc59f857aa
Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730
...
am: b0c5a7af5a
2019-08-23 03:15:04 -07:00
Oscar Shu
02142d5462
Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002
...
am: 4f05f46f13
2019-08-23 03:14:04 -07:00
Anna Trostanetski
a105206a92
Merge "Revert "Always apply compat changes to system apps.""
...
am: 612c2c731d
2019-08-23 03:10:42 -07:00
Jack Yu
e0afc80afb
Merge changes from topic "null_callback" am: 5ce391b313
...
am: 54e83aca93
2019-08-23 03:07:05 -07:00
Jack Yu
966c2eb20d
Added debug messages and watchdog am: 594931f5d9
...
am: 75db0a70dd
2019-08-23 03:06:51 -07:00
Pengquan Meng
13e58d2ed5
Merge "Add geo targeting implementation" am: df2293f68b
...
am: 52cd1fe0f1
2019-08-23 03:02:24 -07:00
Treehugger Robot
87700db4ef
Merge "Update Xbox BT controller mapping to support upcoming controller firmware update"
2019-08-23 10:02:17 +00:00
Nagaraja
40efe816dd
Merge "Added Part & Addr Constants." am: f5d5de8a0f
...
am: 633db92447
2019-08-23 02:58:48 -07:00
Jay Patel
babd85e24d
Merge "Fix AVR compatibility."
...
am: 9e4df4985a
2019-08-23 02:55:04 -07:00
Anna Trostanetski
20f25166c3
Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2
...
am: 81af0fc8bb
2019-08-23 02:54:36 -07:00
