diff options
5 files changed, 9 insertions, 8 deletions
diff --git a/tests/Codegen/runTest.sh b/tests/Codegen/runTest.sh index fe3adf9b2a70..bc1aae03e9a6 100755 --- a/tests/Codegen/runTest.sh +++ b/tests/Codegen/runTest.sh @@ -10,7 +10,7 @@ else return $? } - header_and_eval m -j16 codegen && \ + header_and_eval m -j16 codegen_cli && \ header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java && \ cd $ANDROID_BUILD_TOP && header_and_eval mmma -j16 frameworks/base/tests/Codegen && \ diff --git a/tests/Codegen/src/com/android/codegentest/SampleDataClass.java b/tests/Codegen/src/com/android/codegentest/SampleDataClass.java index 03127ec2814b..f69a092ed3f7 100644 --- a/tests/Codegen/src/com/android/codegentest/SampleDataClass.java +++ b/tests/Codegen/src/com/android/codegentest/SampleDataClass.java @@ -339,8 +339,8 @@ public final class SampleDataClass implements Parcelable { - // Code below generated by codegen v0.0.1. - // on Jul 17, 2019, 5:10:26 PM PDT + // Code below generated by codegen v1.0.0. + // on Jul 29, 2019, 2:50:21 PM PDT // // DO NOT MODIFY! // @@ -409,8 +409,8 @@ public final class SampleDataClass implements Parcelable { public @interface StateName {} @DataClass.Generated( - time = 1563408627046L, - codegenVersion = "0.0.1", + time = 1564437021513L, + codegenVersion = "1.0.0", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java", inputSignatures = "public static final java.lang.String STATE_NAME_UNDEFINED\npublic static final java.lang.String STATE_NAME_ON\npublic static final java.lang.String STATE_NAME_OFF\npublic static final int STATE_UNDEFINED\npublic static final int STATE_ON\npublic static final int STATE_OFF\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_MANUAL_REQUEST\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_COMPATIBILITY_MODE_REQUEST\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_AUGMENTED_REQUEST\nprivate int mNum\nprivate int mNum2\nprivate int mNum4\nprivate @android.annotation.Nullable java.lang.String mName\nprivate java.lang.String mName2\nprivate @android.annotation.NonNull java.lang.String mName4\nprivate android.view.accessibility.AccessibilityNodeInfo mOtherParcelable\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.codegentest.DateParcelling.class) java.util.Date mDate\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForPattern.class) java.util.regex.Pattern mPattern\nprivate java.util.List<android.net.LinkAddress> mLinkAddresses2\nprivate @com.android.internal.util.DataClass.PluralOf(\"linkAddress\") java.util.ArrayList<android.net.LinkAddress> mLinkAddresses\nprivate @android.annotation.Nullable android.net.LinkAddress[] mLinkAddresses4\nprivate boolean mActive\nprivate @com.android.codegentest.SampleDataClass.StateName java.lang.String mStateName\nprivate @com.android.codegentest.SampleDataClass.RequestFlags int mFlags\nprivate @com.android.codegentest.SampleDataClass.State int mState\npublic java.lang.CharSequence charSeq\nprivate final android.net.LinkAddress[] mLinkAddresses5\nprivate transient android.net.LinkAddress[] mLinkAddresses6\ntransient int[] mTmpStorage\nprivate @android.annotation.StringRes int mStringRes\nprivate @android.annotation.IntRange(from=0L, to=4L) int mLimited\nprivate @android.annotation.Size(2L) @com.android.internal.util.DataClass.Each @android.annotation.FloatRange(from=0.0) float[] mCoords\nprivate int[] lazyInitTmpStorage()\npublic android.net.LinkAddress[] getLinkAddresses4()\nprivate boolean patternEquals(java.util.regex.Pattern)\nprivate int patternHashCode()\nprivate void onConstructed()\npublic void dump(java.io.PrintWriter)") diff --git a/tools/codegen/Android.bp b/tools/codegen/Android.bp index 805b2968bca0..677bee2cce81 100644 --- a/tools/codegen/Android.bp +++ b/tools/codegen/Android.bp @@ -1,5 +1,5 @@ java_binary_host { - name: "codegen", + name: "codegen_cli", manifest: "manifest.txt", srcs: [ "src/**/*.kt", diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 41641f6dab47..175eea6ef0d0 100644 --- a/tools/codegen/src/com/android/codegen/SharedConstants.kt +++ b/tools/codegen/src/com/android/codegen/SharedConstants.kt @@ -1,4 +1,4 @@ package com.android.codegen const val CODEGEN_NAME = "codegen" -const val CODEGEN_VERSION = "0.0.1"
\ No newline at end of file +const val CODEGEN_VERSION = "1.0.0"
\ No newline at end of file diff --git a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt index 9e51180509a8..e5ec17a1d18d 100644 --- a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt +++ b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt @@ -125,6 +125,7 @@ class StaleDataclassProcessor: AbstractProcessor() { val lastGenerated = annotationParams["time"] as Long val codegenVersion = annotationParams["codegenVersion"] as String + val codegenMajorVersion = codegenVersion.substringBefore(".") val sourceRelative = File(annotationParams["sourceFile"] as String) val lastGenInputSignatures = (annotationParams["inputSignatures"] as String).lines().toSet() @@ -151,7 +152,7 @@ class StaleDataclassProcessor: AbstractProcessor() { stale += Stale(clazz, source, lastGenerated) } - if (codegenVersion != CODEGEN_VERSION) { + if (codegenMajorVersion != CODEGEN_VERSION.substringBefore(".")) { stale += Stale(clazz, source, lastGenerated) } } |