Add a variable indicating the target as Android M or later.

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1214 matching lines @@
 #     (optional).
 #   apk_under_test: For an instrumentation test apk, this is the target of the
 #     tested apk.
 #   include_all_resources - If true include all resource IDs in all generated
 #     R.java files.
 #   testonly: Marks this target as "test-only".
 #   write_asset_list: Adds an extra file to the assets, which contains a list of
 #     all other asset files.
 #   alternative_locale_resource_dep: The locale resource target which overrides
 #     any exsting locale resources in dep graph.
+#   requires_sdk_api_level_23: If defined and true, the apk is intended for
+#     installation only on Android M or later. In these releases the system
+#     linker does relocation unpacking, so we can enable it unconditionally.
 #
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
 #     this directory will be included in the library. This is only supported to
 #     ease the gyp->gn conversion and will be removed in the future.
 #
 # Example
 #   android_apk("foo_apk") {
 #     android_manifest = "AndroidManifest.xml"
 #     java_files = [
 #       "android/org/chromium/foo/FooApplication.java",
@@ skipping 84 matching lines @@
       chromium_linker_supported
   _enable_relocation_packing =
       defined(invoker.enable_relocation_packing) &&
       invoker.enable_relocation_packing && _use_chromium_linker
   _load_library_from_apk =
       defined(invoker.load_library_from_apk) && invoker.load_library_from_apk
 
   assert(_use_chromium_linker || true)  # Mark as used.
   assert(_enable_relocation_packing || true)  # Mark as used.
 
-  assert(
-      !_load_library_from_apk || _use_chromium_linker,
-      "Loading library from the apk requires use" + " of the Chromium linker.")
+  assert(!_load_library_from_apk || _use_chromium_linker,
+         "Loading library from the apk requires use of the Chromium linker.")

[Torne, 2016/02/16 15:46:56]

It's okay to load library from APK if it's sdk 23+ also, right?

[simonb (inactive), 2016/02/16 16:54:08]

Yes, but at present only if the chromium linker is being used (requires path
shuffling to construct a full path_to_apk!/path_within_apk.so string, passed to
android_dlopen_ext). This differs from relocation unpacking, which the Android M
and later system linker handles transparently and no matter how/where the
library is loaded.

I'm planning other changes to separate load from apk out from the chromium
linker. For now this change targets only relocation packing.

[Torne, 2016/02/16 17:58:49]

OK.

+
+  # If the apk is for Android M or later, always enable relocation packing.
+  if (defined(invoker.requires_sdk_api_level_23) &&

[Torne, 2016/02/16 15:46:56]

Can we just make this setting work like the other one? i.e. just allow the
defining APK to specify whether it wants relocation packing, and then assert
that the linker will support it?

If we forcibly enable it here there won't be an easy way to build without it to
compare.

[simonb (inactive), 2016/02/16 16:54:08]

The assert condition that the linker supports unpacking is "uses chromium linker
OR apk's target android version is M or later". There isn't any easy way in gn
to check the second of these -- the apk's target version could be a string like
"M", or a string like "23", or an integer like 23, or something else entirely.

If there were a way to check for apk target version later than or equal to
android M that would be better used rather than a special flag. I don't believe
there is one, though.

[Torne, 2016/02/16 17:58:49]

No, I mean, can we just make the *logic* work the same way: let the person
defining the target set enable_relocation_packing = true, and then assert that
if they did that that either they're using the chromium linker or they also set
requires_sdk_api_level_23.

Currently this behaves completely differently to the other one: it's forced on
for api 23, and there's also no error if you try to enable it in a situation
where it doesn't work.

+      invoker.requires_sdk_api_level_23) {
+    _enable_relocation_packing = true
+  }
 
   # The dependency that makes the chromium linker, if any is needed.
   _native_libs_deps = []
 
   if (defined(invoker.native_libs) && invoker.native_libs != []) {
     if (is_component_build || is_asan) {
       _native_libs += [ "$root_shlib_dir/libc++_shared.so" ]
       _native_libs_deps += [ "//build/android:cpplib_stripped" ]
     }
 
@@ skipping 968 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }