| commit | 7d7c2180d468460ce2d892dc475ba389ad107665 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Oct 01 09:15:34 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 01 09:15:34 2018 +0000 |
| tree | 59b38f5d2a482d7df250467cd7a0cd6465eddf00 | |
| parent | 9090761f12e770eb3f78875cfc1a1734779a6610 [diff] | |
| parent | 8792b9936115d09e5853e1b0aedc1c4da9220bd1 [diff] |
Merge "Add CorePlatformApi to intra core api"
diff --git a/luni/src/main/java/libcore/api/CorePlatformApi.java b/luni/src/main/java/libcore/api/CorePlatformApi.java index 09837a0..99f1679 100644 --- a/luni/src/main/java/libcore/api/CorePlatformApi.java +++ b/luni/src/main/java/libcore/api/CorePlatformApi.java
@@ -38,6 +38,7 @@ * * @hide */ +@IntraCoreApi @Target({TYPE, FIELD, METHOD, CONSTRUCTOR, ANNOTATION_TYPE}) @Retention(RetentionPolicy.SOURCE) public @interface CorePlatformApi {
diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt index e537383..cede7e3 100644 --- a/mmodules/intracoreapi/api/intra/current-api.txt +++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -60,6 +60,9 @@ package libcore.api { + public abstract class CorePlatformApi implements java.lang.annotation.Annotation { + } + public abstract class IntraCoreApi implements java.lang.annotation.Annotation { }