diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-05-22 14:11:22 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2015-05-22 17:57:29 -0700 |
| commit | 476e582d2ffdf25102d4c55f8c242baa3d21d37f (patch) | |
| tree | 55697be085d321b979f833996cb8c9cee9a4afc5 /tools/layoutlib/create | |
| parent | dd5ee4b89083ec9b50b8c9739274136b0c74abb5 (diff) | |
| download | frameworks_base-476e582d2ffdf25102d4c55f8c242baa3d21d37f.zip frameworks_base-476e582d2ffdf25102d4c55f8c242baa3d21d37f.tar.gz frameworks_base-476e582d2ffdf25102d4c55f8c242baa3d21d37f.tar.bz2 | |
LayoutLib: Change nullity annotations.
Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).
A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.
Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
Diffstat (limited to 'tools/layoutlib/create')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java index 7872fee..f528a97 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java @@ -119,6 +119,8 @@ public class Main { "android.app.TimePickerDialog", // b.android.com/61515 "com.android.internal.view.menu.ActionMenu", "android.icu.**", // needed by LayoutLib + "android.annotation.NonNull", // annotations + "android.annotation.Nullable", // annotations }, excludeClasses, new String[] { |