Fix app id name clash in benchmark module

Change-Id: I5889ef4b9338a940f43efc7629dca155068588ec

Author: wojtek-kalicinski

benchmark/build.gradle.kts benchmarks/build.gradle.ktsbenchmark/build.gradle.kts renamed to benchmarks/build.gradle.kts

@@ -21,7 +21,7 @@ plugins {
 }
 
 android {
-    namespace = "com.google.samples.apps.nowinandroid.benchmark"
+    namespace = "com.google.samples.apps.nowinandroid.benchmarks"
 
     defaultConfig {
         minSdk = 23

benchmark/src/main/AndroidManifest.xml benchmarks/src/main/AndroidManifest.xmlbenchmark/src/main/AndroidManifest.xml renamed to benchmarks/src/main/AndroidManifest.xml

@@ -16,10 +16,16 @@
 
 package com.google.samples.apps.nowinandroid
 
-import com.google.samples.apps.nowinandroid.benchmark.BuildConfig
+import com.google.samples.apps.nowinandroid.benchmarks.BuildConfig
 
 /**
  * Convenience parameter to use proper package name with regards to build type and build flavor.
  */
-const val PACKAGE_NAME =
-    "com.google.samples.apps.nowinandroid.${BuildConfig.FLAVOR}.${BuildConfig.BUILD_TYPE}"
+val PACKAGE_NAME = StringBuilder("com.google.samples.apps.nowinandroid").apply {
+    if (BuildConfig.FLAVOR != "prod") {
+        append(".${BuildConfig.FLAVOR}")
+    }
+    if (BuildConfig.BUILD_TYPE != "release") {
+        append(".${BuildConfig.BUILD_TYPE}")
+    }
+}.toString()