Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71d5e777 authored by Eugene Susla's avatar Eugene Susla
Browse files

Fix codegen not accepting relative paths 

Fixes: 140886378
Test: codegen tests/Codegen/src/com/android/codegentest/SampleDataClass.java;
./frameworks/base/tests/Codegen/runTest.sh
Change-Id: Ie2b5c55f35ec7865bf34cf9e99ef7751eb5f8d98
parent aa62e30c

tests/Codegen/src/com/android/codegentest/SampleDataClass.java

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ public final class SampleDataClass implements Parcelable { 






    // Code below generated by codegen v1.0.0.

    // Code below generated by codegen v1.0.1.

    //

    // DO NOT MODIFY!

    //
@@ -1798,8 +1798,8 @@ public final class SampleDataClass implements Parcelable { 
    }



    @DataClass.Generated(

            time = 1565126122525L,

            codegenVersion = "1.0.0",

            time = 1568235365376L,

            codegenVersion = "1.0.1",

            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 @android.annotation.NonNull java.lang.String mName2\nprivate @android.annotation.NonNull java.lang.String mName4\nprivate @android.annotation.Nullable android.view.accessibility.AccessibilityNodeInfo mOtherParcelable\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.codegentest.MyDateParcelling.class) @android.annotation.NonNull java.util.Date mDate\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForPattern.class) @android.annotation.NonNull java.util.regex.Pattern mPattern\nprivate @android.annotation.NonNull java.util.List<android.net.LinkAddress> mLinkAddresses2\nprivate @com.android.internal.util.DataClass.PluralOf(\"linkAddress\") @android.annotation.NonNull java.util.ArrayList<android.net.LinkAddress> mLinkAddresses\nprivate @android.annotation.Nullable android.net.LinkAddress[] mLinkAddresses4\nprivate @com.android.codegentest.SampleDataClass.StateName @android.annotation.NonNull java.lang.String mStateName\nprivate @com.android.codegentest.SampleDataClass.RequestFlags int mFlags\nprivate @com.android.codegentest.SampleDataClass.State int mState\npublic @android.annotation.NonNull java.lang.CharSequence charSeq\nprivate final @android.annotation.Nullable 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=6L) int mDayOfWeek\nprivate @android.annotation.Size(2L) @android.annotation.NonNull @com.android.internal.util.DataClass.Each @android.annotation.FloatRange(from=0.0) float[] mCoords\nprivate static  java.lang.String defaultName4()\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)\nclass SampleDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genConstructor=true, genEqualsHashCode=true, genToString=true, genForEachField=true, genSetters=true)")

    @Deprecated

tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class SampleWithCustomBuilder { 






    // Code below generated by codegen v1.0.0.

    // Code below generated by codegen v1.0.1.

    //

    // DO NOT MODIFY!

    //
@@ -176,8 +176,8 @@ public class SampleWithCustomBuilder { 
    }



    @DataClass.Generated(

            time = 1565126123496L,

            codegenVersion = "1.0.0",

            time = 1568235366386L,

            codegenVersion = "1.0.1",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java",

            inputSignatures = "  long delayAmount\n @android.annotation.NonNull java.util.concurrent.TimeUnit delayUnit\n  long creationTimestamp\nclass SampleWithCustomBuilder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genBuilder=true)\nabstract  com.android.codegentest.SampleWithCustomBuilder.Builder setDelayAmount(long)\npublic abstract  com.android.codegentest.SampleWithCustomBuilder.Builder setDelayUnit(java.util.concurrent.TimeUnit)\npublic  com.android.codegentest.SampleWithCustomBuilder.Builder setDelay(long,java.util.concurrent.TimeUnit)\nclass BaseBuilder extends java.lang.Object implements []")

    @Deprecated

tools/codegen/src/com/android/codegen/Main.kt

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ fun main(args: Array<String>) { 
        println(CODEGEN_VERSION)

        System.exit(0)

    }

    val file = File(args.last())

    val file = File(args.last()).absoluteFile

    val sourceLinesNoClosingBrace = file.readLines().dropLastWhile {

        it.startsWith("}") || it.all(Char::isWhitespace)

    }

tools/codegen/src/com/android/codegen/SharedConstants.kt

+1 −1
Original line number Diff line number Diff line 
package com.android.codegen



const val CODEGEN_NAME = "codegen"

const val CODEGEN_VERSION = "1.0.0"

const val CODEGEN_VERSION = "1.0.1"



const val CANONICAL_BUILDER_CLASS = "Builder"

const val BASE_BUILDER_CLASS = "BaseBuilder"