diff options
| author | 2019-03-08 12:34:28 +0000 | |
|---|---|---|
| committer | 2019-03-08 13:26:28 +0000 | |
| commit | c1d180cd7b3f30fecd23a21f10bc242a8bc48d7f (patch) | |
| tree | c4d681e0e242f139216431828335718e439bc45f | |
| parent | 75b9b48cec1facfd236a7a203ff7e0850151ff3e (diff) | |
| parent | 04e04516b46a6e435282391f8cc4a7f50fe665b7 (diff) | |
resolve merge conflicts of 04e04516b46a6e435282391f8cc4a7f50fe665b7 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
| -rw-r--r-- | Android.bp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 51a3f6a2c159..81c2725263a9 100644 --- a/Android.bp +++ b/Android.bp @@ -1689,3 +1689,11 @@ filegroup { "core/java/android/annotation/NonNull.java", ], } + +// Creates an index of AIDL methods; used for adding UnsupportedAppUsage +// annotations to private apis +aidl_mapping { + name: "framework-aidl-mappings", + srcs: [":framework-defaults"], + output: "framework-aidl-mappings.txt" +} |