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

Commit 0c5fdb60 authored by Ta-wei Yen's avatar Ta-wei Yen
Browse files

Allow google dialer code to be compiled against M and N SDKs 

+ Class SdkSelectionUtils to provides information of the SDK the app is
  build against.
  Specifically, information that change when the TARGET_N_SDK build flag is
  set in the makefile.
  This is not related to the targetSdkVersion value in AndroidManifest.xml.

Bug:26330692
Change-Id: Ie9e7d734964b5da930d33f69650643bfd2c1e178
parent 34ce8f1b

src-N/com/android/dialer/SdkSelectionUtils.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.dialer;



/**

 * Provides information for the SDK the app is built against.

 * Specifically, information that change when the TARGET_N_SDK build flag is set in the makefile.

 * This is not related to the targetSdkVersion value in AndroidManifest.xml.

 *

 * Usage case will be branching test code in src/, instead of swapping between src-N and src-pre-N.

 */

public class SdkSelectionUtils {



    /**

     * Whether the app is build against N SDK.

     *

     * Since Build.VERSION.SDK_INT remains 23 on N SDK for now, this is currently the only way to

     * check if we are building with N SDK or other.

     */

    public static final boolean TARGET_N_SDK = true;

}

src-pre-N/com/android/dialer/SdkSelectionUtils.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.dialer;



/**

 * Provides information for the SDK the app is built against.

 * Specifically, information that change when the TARGET_N_SDK build flag is set in the makefile.

 * This is not related to the targetSdkVersion value in AndroidManifest.xml.

 *

 * Usage case will be branching test code in src/, instead of using src-N/ and src-pre-N/

 */

public class SdkSelectionUtils {



    /**

     * Whether the app is build against N SDK.

     *

     * Since Build.VERSION.SDK_INT remains 23 on N SDK for now, this is currently the only way to

     * check if we are building with N SDK or other.

     */

    public static final boolean TARGET_N_SDK = false;

}

tests/src-N/com/android/dialer/SdkSelectionUtilsTest.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */





package com.android.dialer;



import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;



// @formatter:off

/**

 * Run test with

 * adb shell am instrument -e class com.android.dialer.SdkSelectionUtilsTest -w com.google.android.dialer.tests/android.test.InstrumentationTestRunner

 */

// @formatter:on

@SmallTest

public class SdkSelectionUtilsTest extends AndroidTestCase {



    public void testTargetNSdk_True() {

        assertTrue(SdkSelectionUtils.TARGET_N_SDK);

    }

}
 
 No newline at end of file

tests/src-pre-N/com/android/dialer/SdkSelectionUtilsTest.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */





package com.android.dialer;



import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;



// @formatter:off

/**

 * Run test with

 * adb shell am instrument -e class com.android.dialer.SdkSelectionUtilsTest -w com.google.android.dialer.tests/android.test.InstrumentationTestRunner

 */

// @formatter:on

@SmallTest

public class SdkSelectionUtilsTest extends AndroidTestCase {



    public void testTargetNSdk_False() {

        assertFalse(SdkSelectionUtils.TARGET_N_SDK);

    }

}
 
 No newline at end of file