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

Commit 45407b47 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "set ro.adb.secure=1 for user builds"

am: f9911ae0

* commit 'f9911ae0':
  set ro.adb.secure=1 for user builds
parents 647a1d77 f9911ae0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ for these).
        <li>Installs non-APK modules that have no tags specified.
        <li>Installs APKs according to the product definition files; tags
            are ignored for APK modules.
        <li><code>ro.adb.secure=1</code>
        <li><code>ro.secure=1</code>
        <li><code>ro.debuggable=0</code>
        <li><code>adb</code> is disabled by default.
+4 −0
Original line number Diff line number Diff line
@@ -365,6 +365,10 @@ ifneq (,$(user_variant))
  # Target is secure in user builds.
  ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1

  ifeq ($(user_variant),user)
    ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
  endif

  ifeq ($(user_variant),userdebug)
    # Pick up some extra useful tools
    tags_to_install += debug