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

Commit a76f5988 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

InProcessNetworkStack requires platform-signed APK 

PlatformCaptivePortalLogin must be used with InProcessNetworkStack
instead of CaptivePortalLogin, since the signature of the APKs must
match.

Bug: 132666298
Test: Flashed walleye_svelte-eng, networking and captive portal working,
      including "use as-is".
(merged from I243b29f2397b22f0d55af0d8927e75916d644198)
Merged-In: I53e08a74ed86941782a0e656f68538d367ae2c19

Change-Id: I34237a3aa06f63d08684dc7cb90ef0fbbf35d85c
parent 05bb41f1

Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ android_app { 
    // InProcessNetworkStack is a replacement for NetworkStack

    overrides: ["NetworkStack"],

    // The permission configuration *must* be included to ensure security of the device

    required: ["PlatformNetworkPermissionConfig"],

    // The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces

    // the default CaptivePortalLogin.

    required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],

}



// Updatable network stack packaged as an application

CleanSpec.mk

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# Copyright (C) 2019 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.

#



# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

# *****************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER

# *****************************************************************



# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************