From patchwork Thu Jan 29 19:07:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Shmidt X-Patchwork-Id: 434635 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EB1C014017C for ; Fri, 30 Jan 2015 06:07:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 5A9E59D34F; Thu, 29 Jan 2015 14:07:29 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZsWS8RV6qhcM; Thu, 29 Jan 2015 14:07:29 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id C4F009D336; Thu, 29 Jan 2015 14:07:24 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 3B9B39D336 for ; Thu, 29 Jan 2015 14:07:23 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zaVLm2d7+ZW1 for ; Thu, 29 Jan 2015 14:07:18 -0500 (EST) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 8C66A9D21A for ; Thu, 29 Jan 2015 14:07:18 -0500 (EST) Received: by mail-vc0-f176.google.com with SMTP id kv7so9444667vcb.7 for ; Thu, 29 Jan 2015 11:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=wbG/6Txz4zayHx/dYrSBU4sKnMwPSrTbYyjS5br713s=; b=V2jlamV3YHwRS9RxwLx70ZicgvBTw28RTVhCs0kw7KTK2FTd6q8dAe9jFrubbtZEU3 1ML2ovmTvC5ap6GfffUHRDCjrwCgZhqecQ3Q3t6muzlNGdx5LMPyQTO5R1HN4/KMV1fz qlTiDyu4rGcNfb1iB+vCK01l+qXuvmLZFaqOpVc/56h/pzSe+udJKVWjhFFCYMQ8E6g2 hfwpP3apsmSjOopZIZFLm0tXX4fTeO+3GF8IQn6gJwjDPnnd7bVLkG+d7tZnwL40tJL9 Ho/kuYD15nI1FPmF/0eU6lVke/F4Ika6ujqNzp4T6QwZIYs+JoHBQiWkWmvOg1njKcFo Qnqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=wbG/6Txz4zayHx/dYrSBU4sKnMwPSrTbYyjS5br713s=; b=dZI4vkAy646OiGUNBs+IS2kJZf08MROVDIPBvwHmhu4JKV5+siHn1e1TduJ08CB0QO Lwkx028eHttOl4SnXgZsr/Q6zHGn/lhEn5Qk7dNIHBQ0yx77ytWaeAsGY41QWodDDawy YZ/anWQyMiTQtojUiS3mVZD+hUWfS7KsGVFJBh3YWJ7JXxW/sd9j4aL6HhQF9c5PLwOc TxAmXg8ZQsA/hD+qqHPXWHPill1nI0fXEibxVVl/QqN3yikd0yW/x/KJQU68V8xcsbC2 dMQOXlNN8PY4PAskEr+ebowJkvToenOo/zWez/3rxQZZ3EY06md/vEP1/kT8MiGenIS0 uJdA== X-Gm-Message-State: ALoCoQnTS/yKwg4PjoqnpC67T27acFkTG04gGun/lHsvplsiRKdtRLsZFSRV0/O4BwFY9mhOG8CS MIME-Version: 1.0 X-Received: by 10.220.2.210 with SMTP id 18mr1260769vck.3.1422558438109; Thu, 29 Jan 2015 11:07:18 -0800 (PST) Received: by 10.52.0.110 with HTTP; Thu, 29 Jan 2015 11:07:18 -0800 (PST) Date: Thu, 29 Jan 2015 11:07:18 -0800 Message-ID: Subject: [PATCH] Android: Remove superfluous OpenSSL include paths. From: Dmitry Shmidt To: hostap X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From c91a1dd0652b0083f66a9714d4396378cd049e3d Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 22 Jan 2015 17:13:10 -0800 Subject: [PATCH] Android: Remove superfluous OpenSSL include paths. The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: If8722a70dd82aad34d4a203c2af46110c98f42dc Signed-off-by: Dmitry Shmidt --- hostapd/Android.mk | 1 - hs20/client/Android.mk | 1 - wpa_supplicant/Android.mk | 1 - 3 files changed, 3 deletions(-) --. 2.2.0.rc0.207.ga3a616c diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 6fcefdd..123d2c9 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -45,7 +45,6 @@ endif INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/src INCLUDES += $(LOCAL_PATH)/src/utils -INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 ifneq ($(wildcard external/libnl),) diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk index 2457e13..ced6d8d 100644 --- a/hs20/client/Android.mk +++ b/hs20/client/Android.mk @@ -4,7 +4,6 @@ INCLUDES = $(LOCAL_PATH) INCLUDES += $(LOCAL_PATH)/../../src/utils INCLUDES += $(LOCAL_PATH)/../../src/common INCLUDES += $(LOCAL_PATH)/../../src -INCLUDES += external/openssl/include INCLUDES += external/libxml2/include INCLUDES += external/curl/include INCLUDES += external/webkit/Source/WebKit/gtk diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 579582b..2ec99ad 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -61,7 +61,6 @@ INCLUDES += $(LOCAL_PATH)/src/rsn_supp INCLUDES += $(LOCAL_PATH)/src/tls INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += $(LOCAL_PATH)/src/wps -INCLUDES += external/openssl/include INCLUDES += system/security/keystore/include ifdef CONFIG_DRIVER_NL80211 ifneq ($(wildcard external/libnl),)